include: move hw/nmi.h to hw/core/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index a7bce8a04a121dcbe06478f79365009f33c23aec..4b447e126baf3f04760b7238c78459d9361f5f8a 100644 (file)
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "monitor/monitor.h"

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index e877e6c40185b3e3b6523364319da4e858cba12b..960aefc9e26271c6d86765269475e27eefdc6ccb 100644 (file)
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -23,7 +23,7 @@
 #include "hw/intc/i8259.h"
 #include "hw/input/lasips2.h"
 #include "hw/net/lasi_82596.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "hw/usb/usb.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index f80533df1c54678d77d967e6088ac5c1db7841b8..c29856c810a55636442de3614a7e86416073063a 100644 (file)
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -35,7 +35,7 @@
 #include "hw/i386/x86.h"
 #include "hw/i386/topology.h"
 
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "kvm/kvm_i386.h"
 
 

diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c
index 2532322618a4abfb18ba107422b0aba08b5c701b..67cb9acb418b4e18044c7086f89b9e294285a1bd 100644 (file)
--- a/hw/intc/m68k_irqc.c
+++ b/hw/intc/m68k_irqc.c
@@ -11,7 +11,7 @@
 #include "cpu.h"
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "hw/intc/intc.h"
 #include "hw/intc/m68k_irqc.h"
 

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index b91e487e1b8cd19916dad0230dcea37dc687ec50..2a7bc667ec375bab8d10335a3df8ca3054e665ce 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -29,7 +29,7 @@
 #include "system/runstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 
 static uint32_t ipmi_current_uuid = 1;
 

diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
index 94f47175ae59fe289d4da1840d34795a61fed38c..84dd01459cdcb0f6745134b88609fc50bf9d4c48 100644 (file)
--- a/hw/m68k/q800-glue.c
+++ b/hw/m68k/q800-glue.c
@@ -25,7 +25,7 @@
 #include "hw/m68k/q800-glue.h"
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index 9fed4265676c2571d3b5219b56560e039a41a31d..77658cb6d02c0115c7ebb9c31e4c706c748f183a 100644 (file)
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -29,7 +29,7 @@
 #include "hw/misc/macio/macio.h"
 #include "hw/misc/macio/gpio.h"
 #include "hw/core/irq.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index eb3197da9b1f8af31136246c000f03d988e1579b..8a50e9f0d8509806985d327e971bba0d57c96994 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -39,7 +39,7 @@
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_core.h"
 #include "hw/core/loader.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "qapi/visitor.h"
 #include "hw/intc/intc.h"
 #include "hw/ipmi/ipmi.h"

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index bad6918e6eb846b7ee3e3381f278ded013beedac..7363e533e1564455294a07e8104abacfa0a3e35e 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -82,7 +82,7 @@
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "hw/intc/intc.h"
 
 #include "hw/ppc/spapr_cpu_core.h"

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 29d95be2c6491f0f0376e7b6f652eb2b08e2938e..c5e0691a26d627c9d23cd3527d8f7a303b50030e 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -35,7 +35,7 @@
 #include "hw/s390x/ap-bridge.h"
 #include "migration/register.h"
 #include "target/s390x/cpu_models.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "hw/qdev-properties.h"
 #include "hw/s390x/tod.h"
 #include "system/system.h"

diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 072137394889715ab9a0eca10d29c8b12af78fea..0842fe373ae96b575e104684f909db7d9bafc157 100644 (file)
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -28,7 +28,7 @@
 #include "qapi/qapi-events-run-state.h"
 #include "system/runstate.h"
 #include "system/watchdog.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "qemu/help_option.h"
 #include "trace.h"
 

diff --git a/include/hw/nmi.h b/include/hw/core/nmi.h
similarity index 100%
rename from include/hw/nmi.h
rename to include/hw/core/nmi.h

diff --git a/system/cpus.c b/system/cpus.c
index 0b1eabd3c4bd325f4f3fc35d097ec7832ec4808c..a0e1debfea82b7f6535cfec412466ea1de5880c7 100644 (file)
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -39,7 +39,7 @@
 #include "qemu/plugin.h"
 #include "system/cpus.h"
 #include "qemu/guest-random.h"
-#include "hw/nmi.h"
+#include "hw/core/nmi.h"
 #include "system/replay.h"
 #include "system/runstate.h"
 #include "system/cpu-timers.h"