From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 12/28] include: move hw/nmi.h to hw/core/
Date: Thu, 27 Nov 2025 14:14:59 +0100 [thread overview]
Message-ID: <20251127131516.80807-13-pbonzini@redhat.com> (raw)
In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/hw/{ => core}/nmi.h | 0
hw/core/nmi.c | 2 +-
hw/hppa/machine.c | 2 +-
hw/i386/x86.c | 2 +-
hw/intc/m68k_irqc.c | 2 +-
hw/ipmi/ipmi.c | 2 +-
hw/m68k/q800-glue.c | 2 +-
hw/misc/macio/gpio.c | 2 +-
hw/ppc/pnv.c | 2 +-
hw/ppc/spapr.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 2 +-
hw/watchdog/watchdog.c | 2 +-
system/cpus.c | 2 +-
13 files changed, 12 insertions(+), 12 deletions(-)
rename include/hw/{ => core}/nmi.h (100%)
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/hw/core/nmi.c b/hw/core/nmi.c
index a7bce8a04a1..4b447e126ba 100644
--- 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 e877e6c4018..960aefc9e26 100644
--- 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 f80533df1c5..c29856c810a 100644
--- 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 2532322618a..67cb9acb418 100644
--- 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 b91e487e1b8..2a7bc667ec3 100644
--- 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 94f47175ae5..84dd01459cd 100644
--- 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 9fed4265676..77658cb6d02 100644
--- 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 eb3197da9b1..8a50e9f0d85 100644
--- 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 bad6918e6eb..7363e533e15 100644
--- 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 29d95be2c64..c5e0691a26d 100644
--- 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 07213739488..0842fe373ae 100644
--- 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/system/cpus.c b/system/cpus.c
index 0b1eabd3c4b..a0e1debfea8 100644
--- 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"
--
2.51.1
next prev parent reply other threads:[~2025-11-27 13:16 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-27 13:14 [PATCH 00/28] include: cleanup cross-subsystem inclusions, empty include/hw/ Paolo Bonzini
2025-11-27 13:14 ` [PATCH 01/28] include: move qemu_irq_handler out of typedefs.h Paolo Bonzini
2025-11-27 13:14 ` [PATCH 02/28] include: name the MemReentrancyGuard struct Paolo Bonzini
2025-11-27 13:14 ` [PATCH 03/28] include: move memory_ldst* to include/system Paolo Bonzini
2025-11-27 13:14 ` [PATCH 04/28] include: move hw/usb.h to hw/usb/ Paolo Bonzini
2025-11-27 13:14 ` [PATCH 05/28] include: move hw/boards.h to hw/core/ Paolo Bonzini
2025-11-27 13:14 ` [PATCH 06/28] include: move hw/clock.h " Paolo Bonzini
2025-11-27 13:14 ` [PATCH 07/28] include: move hw/fw-path-provider.h " Paolo Bonzini
2025-11-27 13:14 ` [PATCH 08/28] include: move hw/hotplug.h " Paolo Bonzini
2025-11-27 13:14 ` [PATCH 09/28] include: move hw/irq.h " Paolo Bonzini
2025-11-27 13:14 ` [PATCH 10/28] include: move hw/loader-fit.h " Paolo Bonzini
2025-11-27 13:14 ` [PATCH 11/28] include: move hw/loader.h " Paolo Bonzini
2025-11-27 13:14 ` Paolo Bonzini [this message]
2025-11-27 13:15 ` [PATCH 13/28] include: move hw/or-irq.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 14/28] include: move hw/platform-bus.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 15/28] include: move hw/ptimer.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 16/28] include: move hw/qdev-clock.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 17/28] include: move hw/qdev-core.h to hw/core/, rename Paolo Bonzini
2025-11-27 13:15 ` [PATCH 18/28] include: move hw/qdev-dma.h to hw/core/ Paolo Bonzini
2025-11-27 13:15 ` [PATCH 19/28] include: move hw/qdev-properties.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 20/28] include: move hw/qdev-properties-system.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 21/28] include: move hw/registerfields.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 22/28] include: move hw/register.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 23/28] include: move hw/resettable.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 24/28] include: move hw/stream.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 25/28] include: move hw/sysbus.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 26/28] include: move hw/vmstate-if.h " Paolo Bonzini
2025-11-27 13:15 ` [PATCH 27/28] include: move hw/hw.h to hw/core/, rename Paolo Bonzini
2025-11-27 13:15 ` [PATCH 28/28] include: reorganize memory API headers Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251127131516.80807-13-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).