[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/35] kvm: x86: Implicitly clear nmi_injected/pendi
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 34/35] kvm: x86: Implicitly clear nmi_injected/pending on reset |
Date: |
Thu, 6 Jan 2011 15:56:40 -0200 |
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>
Signed-off-by: Marcelo Tosatti <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.2.3
- [Qemu-devel] [PATCH 00/35] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 19/35] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 29/35] kvm: Drop smp_cpus argument from init functions, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 08/35] kvm: introduce kvm_inject_x86_mce_on, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 01/35] kvm: Enable user space NMI injection for kvm guest, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 30/35] kvm: Consolidate must-have capability checks, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 09/35] kvm: x86: Fix DPL write back of segment registers, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 34/35] kvm: x86: Implicitly clear nmi_injected/pending on reset,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 11/35] kvm: x86: Prevent sign extension of DR7 in guest debugging mode, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 23/35] kvm: x86: Reset paravirtual MSRs, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 32/35] kvm: Flush coalesced mmio buffer on IO window exits, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 22/35] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 02/35] kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension(), Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 27/35] kvm: x86: Fix !CONFIG_KVM_PARA build, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 20/35] kvm: x86: Remove redundant mp_state initialization, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 13/35] kvm: Fix coding style violations, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 35/35] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, Marcelo Tosatti, 2011/01/06
- [Qemu-devel] [PATCH 24/35] Synchronize VCPU states before reset, Marcelo Tosatti, 2011/01/06