summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/kvm_emulate.h
diff options
context:
space:
mode:
authorNadav Amit <namit@cs.technion.ac.il>2015-01-26 09:32:23 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-01-26 12:14:42 +0100
commit801806d956c2c198b9fdd3afd156a536f9a3a139 (patch)
tree97b84cd9422ab2b452c2e5a29fbc1672054d2d4a /arch/x86/include/asm/kvm_emulate.h
parent16794aaaab66fa74ab19588a8e255a460e8b3ace (diff)
downloadop-kernel-dev-801806d956c2c198b9fdd3afd156a536f9a3a139.zip
op-kernel-dev-801806d956c2c198b9fdd3afd156a536f9a3a139.tar.gz
KVM: x86: IRET emulation does not clear NMI masking
The IRET instruction should clear NMI masking, but the current implementation does not do so. Signed-off-by: Nadav Amit <namit@cs.technion.ac.il> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/kvm_emulate.h')
-rw-r--r--arch/x86/include/asm/kvm_emulate.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index eb18117..57a9d94 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -208,6 +208,7 @@ struct x86_emulate_ops {
void (*get_cpuid)(struct x86_emulate_ctxt *ctxt,
u32 *eax, u32 *ebx, u32 *ecx, u32 *edx);
+ void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt, bool masked);
};
typedef u32 __attribute__((vector_size(16))) sse128_t;
OpenPOWER on IntegriCloud