diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-03-20 13:11:56 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-13 13:12:40 +0200 |
| commit | 50a2c6e55fa2ce5a2916a2c206bad2c6b0e06df1 (patch) | |
| tree | 0ad5c6445202d419c26a8e18e9aced87bd51665b /target-i386 | |
| parent | 7848c8d19f8556666df25044bbd5d8b29439c368 (diff) | |
| download | qemu-50a2c6e55fa2ce5a2916a2c206bad2c6b0e06df1.zip qemu-50a2c6e55fa2ce5a2916a2c206bad2c6b0e06df1.tar.gz qemu-50a2c6e55fa2ce5a2916a2c206bad2c6b0e06df1.tar.bz2 | |
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 <gnatapov@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 5 | ||||
| -rw-r--r-- | target-i386/kvm.c | 3 | ||||
| -rw-r--r-- | target-i386/kvm_i386.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 8f193a9..c04aed9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "sysemu/kvm.h" #include "sysemu/cpus.h" +#include "kvm_i386.h" #include "topology.h" #include "qemu/option.h" @@ -2494,6 +2495,10 @@ static void x86_cpu_reset(CPUState *s) } s->halted = !cpu_is_bsp(cpu); + + if (kvm_enabled()) { + kvm_arch_reset_vcpu(cpu); + } #endif } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d17eea3..2882e14 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; diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h index 4392ab4..b0b2193 100644 --- a/target-i386/kvm_i386.h +++ b/target-i386/kvm_i386.h @@ -14,6 +14,7 @@ #include "sysemu/kvm.h" bool kvm_allows_irq0_override(void); +void kvm_arch_reset_vcpu(X86CPU *cs); int kvm_device_pci_assign(KVMState *s, PCIHostDeviceAddress *dev_addr, uint32_t flags, uint32_t *dev_id); |