summary refs log tree commit diff stats
path: root/hw/kvmvapic.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-03 14:58:47 +0200
committerAndreas Färber <afaerber@suse.de>2012-10-31 04:12:23 +0100
commitf100f0b38fe43c683f437a8fa3e449d6752f6a58 (patch)
treea39c6435ed12280f3ccd53301063ce2000f26ddd /hw/kvmvapic.c
parent8c5cf3b6219d5d5fb61a9d6e59022fc72dab8f85 (diff)
downloadfocaccia-qemu-f100f0b38fe43c683f437a8fa3e449d6752f6a58.tar.gz
focaccia-qemu-f100f0b38fe43c683f437a8fa3e449d6752f6a58.zip
cpus: Pass CPUState to run_on_cpu()
CPUArchState is no longer needed.

Move the declaration to include/qemu/cpu.h and add documentation.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/kvmvapic.c')
-rw-r--r--hw/kvmvapic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c
index 5e0a7c9384..dc111ee8e6 100644
--- a/hw/kvmvapic.c
+++ b/hw/kvmvapic.c
@@ -475,11 +475,13 @@ static void vapic_enable_tpr_reporting(bool enable)
     VAPICEnableTPRReporting info = {
         .enable = enable,
     };
+    X86CPU *cpu;
     CPUX86State *env;
 
     for (env = first_cpu; env != NULL; env = env->next_cpu) {
+        cpu = x86_env_get_cpu(env);
         info.apic = env->apic_state;
-        run_on_cpu(env, vapic_do_enable_tpr_reporting, &info);
+        run_on_cpu(CPU(cpu), vapic_do_enable_tpr_reporting, &info);
     }
 }
 
@@ -717,7 +719,7 @@ static int vapic_post_load(void *opaque, int version_id)
     }
     if (s->state == VAPIC_ACTIVE) {
         if (smp_cpus == 1) {
-            run_on_cpu(first_cpu, do_vapic_enable, s);
+            run_on_cpu(ENV_GET_CPU(first_cpu), do_vapic_enable, s);
         } else {
             zero = g_malloc0(s->rom_state.vapic_size);
             cpu_physical_memory_rw(s->vapic_paddr, zero,