[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/35] kvm: Enable user space NMI injection for kvm
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 01/35] kvm: Enable user space NMI injection for kvm guest |
Date: |
Thu, 6 Jan 2011 15:56:07 -0200 |
From: Lai Jiangshan <address@hidden>
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 <address@hidden>
Acked-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
configure | 3 +++
target-i386/kvm.c | 7 +++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index 47e4cf0..ec37a91 100755
--- a/configure
+++ b/configure
@@ -1674,6 +1674,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 7dfc357..755f8c9 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) &&
--
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 <=
- [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, 2011/01/06
- [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