[Qemu-devel] [PATCH 05/32] use more meaningful values for kqemu_cpu_exec

[Glauber Costa <glommer@redhat.com>]

define constants that actually mean something instead of 1, 2, etc

Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 cpu-exec.c |    4 ++--
 exec-all.h |    4 ++++
 kqemu.c    |   12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cpu-exec.c b/cpu-exec.c
index f06df26..88b7d6f 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -339,10 +339,10 @@ int cpu_exec(CPUState *env1)
             env->eflags = env->eflags | cc_table[CC_OP].compute_all()  | (DF & DF_MASK);
             ret = kqemu_cpu_exec(env);
             env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
-            if (ret == 1) {
+            if (ret == EXEC_EXIT_INTR) {
                 /* exception */
                 longjmp(env->jmp_env, 1);
-            } else if (ret == 2) {
+            } else if (ret == EXEC_EXIT_SOFTMMU) {
                 /* softmmu execution needed */
             } else {
                 if (env->interrupt_request != 0) {
diff --git a/exec-all.h b/exec-all.h
index e3da98a..c10248b 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -356,6 +356,10 @@ static inline int can_do_io(CPUState *env)
 }
 #endif
 
+#define EXEC_EXIT_DONE 0
+#define EXEC_EXIT_INTR 1
+#define EXEC_EXIT_SOFTMMU 2
+
 #ifdef USE_KQEMU
 #define KQEMU_MODIFY_PAGE_MASK (0xff & ~(VGA_DIRTY_FLAG | CODE_DIRTY_FLAG))
 
diff --git a/kqemu.c b/kqemu.c
index 39938e0..d2bfd05 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -892,7 +892,7 @@ int kqemu_do_cpu_exec(CPUState *env)
             cpu_dump_state(env, logfile, fprintf, 0);
         }
 #endif
-        return 1;
+        return EXEC_EXIT_INTR;
     } else if ((ret & 0xff00) == KQEMU_RET_EXCEPTION) {
         env->exception_index = ret & 0xff;
         env->error_code = kenv->error_code;
@@ -908,7 +908,7 @@ int kqemu_do_cpu_exec(CPUState *env)
             cpu_dump_state(env, logfile, fprintf, 0);
         }
 #endif
-        return 1;
+        return EXEC_EXIT_INTR;
     } else if (ret == KQEMU_RET_INTR) {
 #ifdef CONFIG_PROFILER
         kqemu_ret_intr_count++;
@@ -918,7 +918,7 @@ int kqemu_do_cpu_exec(CPUState *env)
             cpu_dump_state(env, logfile, fprintf, 0);
         }
 #endif
-        return 0;
+        return EXEC_EXIT_DONE;
     } else if (ret == KQEMU_RET_SOFTMMU) {
 #ifdef CONFIG_PROFILER
         {
@@ -931,19 +931,19 @@ int kqemu_do_cpu_exec(CPUState *env)
             cpu_dump_state(env, logfile, fprintf, 0);
         }
 #endif
-        return 2;
+        return EXEC_EXIT_SOFTMMU;
     } else {
         cpu_dump_state(env, stderr, fprintf, 0);
         fprintf(stderr, "Unsupported return value: 0x%x\n", ret);
         exit(1);
     }
-    return 0;
+    return EXEC_EXIT_DONE;
 }
 
 int kqemu_cpu_exec(CPUState *env)
 {
 
-    int ret = 2;
+    int ret = EXEC_EXIT_SOFTMMU;
     if (kqemu_is_ok(env) && env->interrupt_request == 0) {
         ret = kqemu_do_cpu_exec(env);
         /* put eflags in CPU temporary format */
-- 
1.5.5.1