From: Andreas Färber <afaerber@suse.de>
Date: Sun, 26 May 2013 21:24:55 +0000 (+0200)
Subject: cpus: Change qemu_kvm_wait_io_event() argument to CPUState
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~251^2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd529e8f465c0d6b2d5f01c58cee4746425d2734;p=qemu-upstream-4.4-testing.git

cpus: Change qemu_kvm_wait_io_event() argument to CPUState

It no longer uses CPUArchState.

Prepares for changing qemu_kvm_cpu_thread_fn() opaque to CPUState.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/cpus.c b/cpus.c
index 5863b517a..37369aeb8 100644
--- a/cpus.c
+++ b/cpus.c
@@ -717,10 +717,8 @@ static void qemu_tcg_wait_io_event(void)
     }
 }
 
-static void qemu_kvm_wait_io_event(CPUArchState *env)
+static void qemu_kvm_wait_io_event(CPUState *cpu)
 {
-    CPUState *cpu = ENV_GET_CPU(env);
-
     while (cpu_thread_is_idle(cpu)) {
         qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex);
     }
@@ -759,7 +757,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
                 cpu_handle_guest_debug(env);
             }
         }
-        qemu_kvm_wait_io_event(env);
+        qemu_kvm_wait_io_event(cpu);
     }
 
     return NULL;