From 276ce81563aeadea5493fbc4fbc84647d5bfbdeb Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Fri, 10 Dec 2010 15:42:53 +0800 Subject: [PATCH] kvm: Enable user space NMI injection for kvm guest Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the user space raised them. (example: qemu monitor's "nmi" command) Signed-off-by: Lai Jiangshan Acked-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- configure | 3 +++ target-i386/kvm.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/configure b/configure index 210670c16f..9a02d1f730 100755 --- a/configure +++ b/configure @@ -1671,6 +1671,9 @@ if test "$kvm" != "no" ; then #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS #endif +#if !defined(KVM_CAP_USER_NMI) +#error Missing KVM capability KVM_CAP_USER_NMI +#endif int main(void) { return 0; } EOF if test "$kerneldir" != "" ; then diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 7dfc357e42..755f8c9089 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env) int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) { + /* Inject NMI */ + if (env->interrupt_request & CPU_INTERRUPT_NMI) { + env->interrupt_request &= ~CPU_INTERRUPT_NMI; + DPRINTF("injected NMI\n"); + kvm_vcpu_ioctl(env, KVM_NMI); + } + /* Try to inject an interrupt if the guest can accept it */ if (run->ready_for_interrupt_injection && (env->interrupt_request & CPU_INTERRUPT_HARD) &&