From: Bandan Das <bsd@redhat.com>
Date: Fri, 20 May 2016 16:28:37 +0000 (-0400)
Subject: cpus: call the core nmi injection function
X-Git-Tag: qemu-xen-4.8.0-rc1~258^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1453e6627d19a8d6d54480c6980f5cef5dfc6833;p=qemu-xen.git

cpus: call the core nmi injection function

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>
---

diff --git a/cpus.c b/cpus.c
index f8366c684e..e75895a458 100644
--- 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)