[PATCH 2/4] hw/nmi: Introduce nmi_cpu_handler() for vcpu-specific delivery

["Philippe Mathieu-Daudé" <philmd@oss.qualcomm.com>]

No need to have handlers check for existing CPU index,
lookup the CPUState once in the core do_nmi() code and
pass along.

Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
---
 include/hw/core/nmi.h |  1 +
 hw/core/nmi.c         | 29 +++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/include/hw/core/nmi.h b/include/hw/core/nmi.h
index 6136290f4fe..2f554d58b7f 100644
--- a/include/hw/core/nmi.h
+++ b/include/hw/core/nmi.h
@@ -38,6 +38,7 @@ struct NMIClass {
     InterfaceClass parent_class;
 
     void (*nmi_monitor_handler)(NMIState *n, int cpu_index, Error **errp);
+    void (*nmi_cpu_handler)(NMIState *ns, CPUState *cs);
 };
 
 /**
diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index 67213631c04..fb623fd00be 100644
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -43,13 +43,30 @@ static int do_nmi(Object *o, void *opaque)
         NMIClass *nc = NMI_GET_CLASS(n);
 
         ns->handled = true;
-        if (ns->cpu_index == -1) {
-            /* Any vCPU is OK, take the first one */
-            ns->cpu_index = first_cpu->cpu_index;
+
+        /* Generic handler */
+        if (nc->nmi_monitor_handler) {
+            nc->nmi_monitor_handler(n, ns->cpu_index, &ns->err);
+            if (ns->err) {
+                return -1;
+            }
         }
-        nc->nmi_monitor_handler(n, ns->cpu_index, &ns->err);
-        if (ns->err) {
-            return -1;
+        /* Per vCPU handler */
+        if (nc->nmi_cpu_handler) {
+            CPUState *cs;
+
+            if (ns->cpu_index >= 0) {
+                /* Specific vCPU requested */
+                cs = qemu_get_cpu(ns->cpu_index);
+            } else {
+                /* Any vCPU is OK, take the first one */
+                cs = first_cpu;
+            }
+            if (!cs) {
+                error_setg(&ns->err, "CPU %d does not exist", ns->cpu_index);
+                return -1;
+            }
+            nc->nmi_cpu_handler(n, cs);
         }
     }
     nmi_children(o, ns);
-- 
2.53.0