[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 21/21] kvm: x86: Implicitly clear nmi_injected/pe
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v3 21/21] kvm: x86: Implicitly clear nmi_injected/pending on reset |
Date: |
Tue, 4 Jan 2011 09:32:33 +0100 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
---
target-i386/cpu.h | 6 ++++--
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 a457423..af701a4 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 50d8ec8..79a1da8 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -520,8 +520,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 :
--
1.7.1
- [Qemu-devel] [PATCH v3 16/21] kvm: Drop smp_cpus argument from init functions, (continued)
- [Qemu-devel] [PATCH v3 16/21] kvm: Drop smp_cpus argument from init functions, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 19/21] kvm: Flush coalesced mmio buffer on IO window exits, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 18/21] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 20/21] kvm: Do not use qemu_fair_mutex, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 15/21] kvm: x86: Introduce kvmclock device to save/restore its state, Jan Kiszka, 2011/01/04
[Qemu-devel] [PATCH v3 21/21] kvm: x86: Implicitly clear nmi_injected/pending on reset,
Jan Kiszka <=
[Qemu-devel] [PATCH v3 13/21] kvm: Eliminate KVMState arguments, Jan Kiszka, 2011/01/04
[Qemu-devel] [PATCH v3 17/21] kvm: Consolidate must-have capability checks, Jan Kiszka, 2011/01/04
[Qemu-devel] [PATCH 11.5/21] Synchronize VCPU states before reset, Jan Kiszka, 2011/01/05
[Qemu-devel] [PATCH 22/21] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, Jan Kiszka, 2011/01/05
[Qemu-devel] Re: [PATCH v3 00/21] [uq/master] Prepare for more qemu-kvm merging, Marcelo Tosatti, 2011/01/05