Patchwork [13/19] move tcg_has_work to cpu-exec.c and rename it

login
register
mail settings
Submitter Paolo Bonzini
Date Dec. 21, 2009, 8:09 a.m.
Message ID <1261382970-23251-14-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/41533/
State New
Headers show

Comments

Paolo Bonzini - Dec. 21, 2009, 8:09 a.m.
tcg_has_work is the only user of cpu-exec.c's qemu_cpu_has_work export.
Just move everything into cpu-exec.c.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpu-all.h  |    2 +-
 cpu-exec.c |   16 ++++++++++++++--
 vl.c       |   28 ++--------------------------
 3 files changed, 17 insertions(+), 29 deletions(-)
Marcelo Tosatti - Dec. 23, 2009, 5:59 p.m.
On Mon, Dec 21, 2009 at 09:09:24AM +0100, Paolo Bonzini wrote:
> tcg_has_work is the only user of cpu-exec.c's qemu_cpu_has_work export.
> Just move everything into cpu-exec.c.

cpu_has_work is going to be used by Glauber's KVM SMP patchset soon.
Paolo Bonzini - Dec. 23, 2009, 6:04 p.m.
On 12/23/2009 06:59 PM, Marcelo Tosatti wrote:
> On Mon, Dec 21, 2009 at 09:09:24AM +0100, Paolo Bonzini wrote:
>> tcg_has_work is the only user of cpu-exec.c's qemu_cpu_has_work export.
>> Just move everything into cpu-exec.c.
>
> cpu_has_work is going to be used by Glauber's KVM SMP patchset soon.

Is there a git tree somewhere so that I can adjust this bit?  The latest 
version Glauber sent on Dec 3 didn't have this.

Paolo

Patch

diff --git a/cpu-all.h b/cpu-all.h
index e214374..aef594d 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -781,7 +781,7 @@  void cpu_reset_interrupt(CPUState *env, int mask);
 
 void cpu_exit(CPUState *s);
 
-int qemu_cpu_has_work(CPUState *env);
+int qemu_cpus_have_work(void);
 
 /* Breakpoint/watchpoint flags */
 #define BP_MEM_READ           0x01
diff --git a/cpu-exec.c b/cpu-exec.c
index af4595b..b458484 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -49,9 +49,21 @@  int tb_invalidated_flag;
 //#define CONFIG_DEBUG_EXEC
 //#define DEBUG_SIGNAL
 
-int qemu_cpu_has_work(CPUState *env)
+int qemu_cpus_have_work(void)
 {
-    return cpu_has_work(env);
+    CPUState *env;
+
+    for (env = first_cpu; env != NULL; env = env->next_cpu) {
+        if (env->stop)
+            return 1;
+        if (env->stopped)
+            return 0;
+        if (!env->halted)
+            return 1;
+        if (cpu_has_work(env))
+            return 1;
+    }
+    return 0;
 }
 
 void cpu_loop_exit(void)
diff --git a/vl.c b/vl.c
index 9f363c8..9bf9806 100644
--- a/vl.c
+++ b/vl.c
@@ -3435,7 +3435,6 @@  static QemuCond qemu_pause_cond;
 
 static void block_io_signals(void);
 static void unblock_io_signals(void);
-static int tcg_has_work(void);
 
 static int qemu_init_main_loop(void)
 {
@@ -3458,7 +3457,7 @@  static int qemu_init_main_loop(void)
 
 static void qemu_wait_io_event(CPUState *env)
 {
-    while (!tcg_has_work())
+    while (!qemu_cpus_have_work())
         qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000);
 
     qemu_mutex_unlock(&qemu_global_mutex);
@@ -3922,29 +3921,6 @@  static void tcg_cpu_exec(void)
     }
 }
 
-static int cpu_has_work(CPUState *env)
-{
-    if (env->stop)
-        return 1;
-    if (env->stopped)
-        return 0;
-    if (!env->halted)
-        return 1;
-    if (qemu_cpu_has_work(env))
-        return 1;
-    return 0;
-}
-
-static int tcg_has_work(void)
-{
-    CPUState *env;
-
-    for (env = first_cpu; env != NULL; env = env->next_cpu)
-        if (cpu_has_work(env))
-            return 1;
-    return 0;
-}
-
 static int qemu_calculate_timeout(void)
 {
 #ifndef CONFIG_IOTHREAD
@@ -3952,7 +3928,7 @@  static int qemu_calculate_timeout(void)
 
     if (!vm_running)
         timeout = 5000;
-    else if (tcg_has_work())
+    else if (qemu_cpus_have_work())
         timeout = 0;
     else {
      /* XXX: use timeout computed from timers */