From 50a2c6e55fa2ce5a2916a2c206bad2c6b0e06df1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 20 Mar 2013 13:11:56 +0100 Subject: kvm: reset state from the CPU's reset method Now that we have a CPU object with a reset method, it is better to keep the KVM reset close to the CPU reset. Using qemu_register_reset as we do now keeps them far apart. With this patch, PPC no longer calls the kvm_arch_ function, so it can get removed there. Other arches call it from their CPU reset handler, and the function gets an ARMCPU/X86CPU/S390CPU. Note that ARM- and s390-specific functions are called kvm_arm_* and kvm_s390_*, while x86-specific functions are called kvm_arch_*. That follows the convention used by the different architectures. Changing that is the topic of a separate patch. Reviewed-by: Gleb Natapov Reviewed-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- target-i386/kvm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'target-i386/kvm.c') diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d17eea3186..2882e14dad 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -723,9 +723,8 @@ int kvm_arch_init_vcpu(CPUState *cs) return 0; } -void kvm_arch_reset_vcpu(CPUState *cs) +void kvm_arch_reset_vcpu(X86CPU *cpu) { - X86CPU *cpu = X86_CPU(cs); CPUX86State *env = &cpu->env; env->exception_injected = -1; -- cgit v1.2.3