| Message ID | 5267FC67.3@siemens.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Il 23/10/2013 18:42, Jan Kiszka ha scritto: > __vmx_complete_interrupts stored uninjected NMIs in arch.nmi_injected, > not arch.nmi_pending. So we actually need to check the former field in > vmcs12_save_pending_event. This fixes the eventinj unit test when run > in nested KVM. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > arch/x86/kvm/vmx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index feef3a1..81ce389 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -8078,7 +8078,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu, > } > > vmcs12->idt_vectoring_info_field = idt_vectoring; > - } else if (vcpu->arch.nmi_pending) { > + } else if (vcpu->arch.nmi_injected) { > vmcs12->idt_vectoring_info_field = > INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR; > } else if (vcpu->arch.interrupt.pending) { > Applied to kvm.git queue, thanks. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index feef3a1..81ce389 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8078,7 +8078,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu, } vmcs12->idt_vectoring_info_field = idt_vectoring; - } else if (vcpu->arch.nmi_pending) { + } else if (vcpu->arch.nmi_injected) { vmcs12->idt_vectoring_info_field = INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR; } else if (vcpu->arch.interrupt.pending) {
__vmx_complete_interrupts stored uninjected NMIs in arch.nmi_injected, not arch.nmi_pending. So we actually need to check the former field in vmcs12_save_pending_event. This fixes the eventinj unit test when run in nested KVM. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- arch/x86/kvm/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)