[Qemu-devel] [PATCH 2/2] spapr: Define NMI interface

[Alexey Kardashevskiy]

This defines and makes use of an NMI interface in order to support
the "nmi" command.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
 hw/ppc/spapr.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 62ddb4d..495fa88 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -48,6 +48,7 @@
 #include "hw/pci/pci.h"
 #include "hw/scsi/scsi.h"
 #include "hw/virtio/virtio-scsi.h"
+#include "hw/nmi.h"
 
 #include "exec/address-spaces.h"
 #include "hw/usb.h"
@@ -1539,13 +1540,36 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p, 
BusState *bus,
     return NULL;
 }
 
+static void spapr_do_nmi(void *arg)
+{
+    CPUState *cs = arg;
+    PowerPCCPU *cpu = POWERPC_CPU(cs);
+    CPUPPCState *env = &cpu->env;
+
+    cpu_synchronize_state(cs);
+    env->spr[SPR_SRR0] = env->nip;
+    env->spr[SPR_SRR1] = env->msr;
+    env->nip = 0x100;
+    env->msr = (1ULL << MSR_SF) | (1 << MSR_ME);
+    if (env->spr[SPR_LPCR] & LPCR_ILE) {
+        env->msr |= 1 << MSR_LE;
+    }
+}
+
+void spapr_deliver_nmi(NMIObj *p, CPUState *cs)
+{
+    async_run_on_cpu(cs, spapr_do_nmi, cs);
+}
+
 static void spapr_machine_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
     FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
+    NMIClass *nmic = NMI_CLASS(oc);
 
     mc->qemu_machine = data;
     fwc->get_dev_path = spapr_get_fw_dev_path;
+    nmic->deliver_nmi = spapr_deliver_nmi;
 }
 
 static const TypeInfo spapr_machine_info = {
@@ -1555,10 +1579,12 @@ static const TypeInfo spapr_machine_info = {
     .class_data    = &spapr_machine,
     .interfaces = (InterfaceInfo[]) {
         { TYPE_FW_PATH_PROVIDER },
+        { TYPE_NMI },
         { }
     },
 };
 
+
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
1.8.4.rc4