]> git.proxmox.com Git - mirror_qemu.git/commitdiff
cpus: call the core nmi injection function
authorBandan Das <bsd@redhat.com>
Fri, 20 May 2016 16:28:37 +0000 (12:28 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 23 May 2016 14:53:47 +0000 (16:53 +0200)
We can call the common function here directly since
x86 specific actions will be taken care of by the arch
specific nmi handler

Signed-off-by: Bandan Das <bsd@redhat.com>
Message-Id: <1463761717-26558-4-git-send-email-bsd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
cpus.c

diff --git a/cpus.c b/cpus.c
index f8366c684e3e8bf66d95eac73a5c76e0a6d90625..e75895a458ba3e5a07240fcb635aabaa00cfc80d 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -1693,21 +1693,7 @@ exit:
 
 void qmp_inject_nmi(Error **errp)
 {
-#if defined(TARGET_I386)
-    CPUState *cs;
-
-    CPU_FOREACH(cs) {
-        X86CPU *cpu = X86_CPU(cs);
-
-        if (!cpu->apic_state) {
-            cpu_interrupt(cs, CPU_INTERRUPT_NMI);
-        } else {
-            apic_deliver_nmi(cpu->apic_state);
-        }
-    }
-#else
     nmi_monitor_handle(monitor_get_cpu_index(), errp);
-#endif
 }
 
 void dump_drift_info(FILE *f, fprintf_function cpu_fprintf)