qmp: make block job command naming consistent

[qemu.git] / translate-all.c

diff --git a/translate-all.c b/translate-all.c
index 8c7d303d86ab5024e3144f69dc65c43a79db68d5..5bd2d3711a2696967f8ed930e4a9cbb756e75c9e 100644 (file)
--- a/translate-all.c
+++ b/translate-all.c
@@ -109,11 +109,11 @@ int cpu_gen_code(CPUArchState *env, TranslationBlock *tb, int *gen_code_size_ptr
 /* The cpu state corresponding to 'searched_pc' is restored.
  */
 int cpu_restore_state(TranslationBlock *tb,
 /* The cpu state corresponding to 'searched_pc' is restored.
  */
 int cpu_restore_state(TranslationBlock *tb,

-                      CPUArchState *env, unsigned long searched_pc)
+                      CPUArchState *env, uintptr_t searched_pc)

 {
     TCGContext *s = &tcg_ctx;
     int j;
 {
     TCGContext *s = &tcg_ctx;
     int j;

-    unsigned long tc_ptr;
+    uintptr_t tc_ptr;

 #ifdef CONFIG_PROFILER
     int64_t ti;
 #endif
 #ifdef CONFIG_PROFILER
     int64_t ti;
 #endif


@@ -133,7 +133,7 @@ int cpu_restore_state(TranslationBlock *tb,
     }
 
     /* find opc index corresponding to search_pc */
     }
 
     /* find opc index corresponding to search_pc */

-    tc_ptr = (unsigned long)tb->tc_ptr;
+    tc_ptr = (uintptr_t)tb->tc_ptr;

     if (searched_pc < tc_ptr)
         return -1;
 
     if (searched_pc < tc_ptr)
         return -1;