From caa5af0ff364a23a2783fed0d597cad120455da8 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 6 Nov 2009 19:39:24 +0100 Subject: [PATCH] kvm: Add arch reset handler Will be required by succeeding changes. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- kvm-all.c | 2 ++ kvm.h | 2 ++ target-i386/kvm.c | 4 ++++ target-ppc/kvm.c | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/kvm-all.c b/kvm-all.c index 1916ec604..b605caaef 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -150,6 +150,7 @@ static void kvm_reset_vcpu(void *opaque) { CPUState *env = opaque; + kvm_arch_reset_vcpu(env); if (kvm_arch_put_registers(env)) { fprintf(stderr, "Fatal: kvm vcpu reset failed\n"); abort(); @@ -201,6 +202,7 @@ int kvm_init_vcpu(CPUState *env) ret = kvm_arch_init_vcpu(env); if (ret == 0) { qemu_register_reset(kvm_reset_vcpu, env); + kvm_arch_reset_vcpu(env); ret = kvm_arch_put_registers(env); } err: diff --git a/kvm.h b/kvm.h index ecac82859..e4cbedc91 100644 --- a/kvm.h +++ b/kvm.h @@ -90,6 +90,8 @@ int kvm_arch_init(KVMState *s, int smp_cpus); int kvm_arch_init_vcpu(CPUState *env); +void kvm_arch_reset_vcpu(CPUState *env); + struct kvm_guest_debug; struct kvm_debug_exit_arch; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 6613a3f18..ea6a510ce 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -221,6 +221,10 @@ int kvm_arch_init_vcpu(CPUState *env) return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data); } +void kvm_arch_reset_vcpu(CPUState *env) +{ +} + static int kvm_has_msr_star(CPUState *env) { static int has_msr_star; diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index b53d6e99a..4e1c65f12 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -53,6 +53,10 @@ int kvm_arch_init_vcpu(CPUState *cenv) return ret; } +void kvm_arch_reset_vcpu(CPUState *env) +{ +} + int kvm_arch_put_registers(CPUState *env) { struct kvm_regs regs;