diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-03 04:02:03 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-10-31 01:02:45 +0100 |
| commit | d5a6814697014561dd0a2e2871df0e6c62a0ce59 (patch) | |
| tree | 502a415a7dadd6f8b53844aa7a87ed5190214aee | |
| parent | a096124571b71f02d49a97ca99f4bf7b97b6912a (diff) | |
| download | focaccia-qemu-d5a6814697014561dd0a2e2871df0e6c62a0ce59.tar.gz focaccia-qemu-d5a6814697014561dd0a2e2871df0e6c62a0ce59.zip | |
target-ppc: Rename kvm_kick_{env => cpu} and pass PowerPCCPU
Needed for changing qemu_cpu_kick() argument type to CPUState. Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-ppc/kvm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 5cbe98a164..d7d8e8fef0 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -73,8 +73,11 @@ static int cap_hior; */ 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); } @@ -375,6 +378,7 @@ static inline void kvm_fixup_page_sizes(CPUPPCState *env) int kvm_arch_init_vcpu(CPUPPCState *cenv) { + PowerPCCPU *cpu = ppc_env_get_cpu(cenv); int ret; /* Gather server mmu info from KVM and update the CPU state */ @@ -386,7 +390,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) { |