Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[thirdparty/qemu.git] / kvm-all.c

diff --git a/kvm-all.c b/kvm-all.c
index ce823f9beb58f5ffd877b39673436bb757b76051..2d927217bd64aa756736d833fec08fa471aac314 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1566,18 +1566,14 @@ void kvm_cpu_synchronize_state(CPUArchState *env)
     }
 }
 
-void kvm_cpu_synchronize_post_reset(CPUArchState *env)
+void kvm_cpu_synchronize_post_reset(CPUState *cpu)
 {
-    CPUState *cpu = ENV_GET_CPU(env);
-
     kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE);
     cpu->kvm_vcpu_dirty = false;
 }
 
-void kvm_cpu_synchronize_post_init(CPUArchState *env)
+void kvm_cpu_synchronize_post_init(CPUState *cpu)
 {
-    CPUState *cpu = ENV_GET_CPU(env);
-
     kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE);
     cpu->kvm_vcpu_dirty = false;
 }