Patchwork [qom-next,29/59] target-ppc: Rename kvm_kick_{env => cpu} and pass PowerPCCPU

login
register
mail settings
Submitter Andreas Färber
Date May 23, 2012, 3:07 a.m.
Message ID <1337742502-28565-30-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/160859/
State New
Headers show

Comments

Andreas Färber - May 23, 2012, 3:07 a.m.
Needed for qemu_cpu_kick().

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-ppc/kvm.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index c09cc39..f111e87 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -71,8 +71,11 @@  static int cap_spapr_tce;
  */
 static QEMUTimer *idle_timer;
 
-static void kvm_kick_env(void *env)
+static void kvm_kick_cpu(void *opaque)
 {
+    PowerPCCPU *cpu = opaque;
+    CPUPPCState *env = &cpu->env;
+
     qemu_cpu_kick(env);
 }
 
@@ -169,6 +172,7 @@  static int kvm_booke206_tlb_init(CPUPPCState *env)
 
 int kvm_arch_init_vcpu(CPUPPCState *cenv)
 {
+    PowerPCCPU *cpu = ppc_env_get_cpu(cenv);
     int ret;
 
     ret = kvm_arch_sync_sregs(cenv);
@@ -176,7 +180,7 @@  int kvm_arch_init_vcpu(CPUPPCState *cenv)
         return ret;
     }
 
-    idle_timer = qemu_new_timer_ns(vm_clock, kvm_kick_env, cenv);
+    idle_timer = qemu_new_timer_ns(vm_clock, kvm_kick_cpu, cpu);
 
     /* Some targets support access to KVM's guest TLB. */
     switch (cenv->mmu_model) {