diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-01-21 21:48:21 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-01-23 02:27:22 -0200 |
| commit | d8f771d9124e9a295b564d47d7546d93e844b526 (patch) | |
| tree | f38d63f528be8b418015dc9e9bd51f05acf255e6 | |
| parent | b66042c722e4e7b2811a08873b1ecf2c2c1e5f0a (diff) | |
kvm: x86: Implicitly clear nmi_injected/pending on reset
All CPUX86State variables before CPU_COMMON are automatically cleared on
reset. Reorder nmi_injected and nmi_pending to avoid having to touch
them explicitly.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | target-i386/cpu.h | 6 | ||||
| -rw-r--r-- | target-i386/kvm.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index a457423b4a..af701a4412 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -699,6 +699,10 @@ typedef struct CPUX86State { uint32_t smbase; int old_exception; /* exception in flight */ + /* KVM states, automatically cleared on reset */ + uint8_t nmi_injected; + uint8_t nmi_pending; + CPU_COMMON /* processor features (e.g. for CPUID insn) */ @@ -726,8 +730,6 @@ typedef struct CPUX86State { int32_t exception_injected; int32_t interrupt_injected; uint8_t soft_interrupt; - uint8_t nmi_injected; - uint8_t nmi_pending; uint8_t has_error_code; uint32_t sipi_vector; uint32_t cpuid_kvm_features; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 72f9fdf24e..b2c5ee0efe 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -435,8 +435,6 @@ void kvm_arch_reset_vcpu(CPUState *env) { env->exception_injected = -1; env->interrupt_injected = -1; - env->nmi_injected = 0; - env->nmi_pending = 0; env->xcr0 = 1; if (kvm_irqchip_in_kernel()) { env->mp_state = cpu_is_bsp(env) ? KVM_MP_STATE_RUNNABLE : |