Signed-off-by: Paolo Bonzini <[email protected]>
---
include/hw/acpi/cpu.h | 2 +-
include/hw/acpi/cpu_hotplug.h | 2 +-
include/hw/acpi/pcihp.h | 2 +-
include/hw/{ => core}/hotplug.h | 0
include/hw/i386/pc.h | 2 +-
include/hw/pci/pcie.h | 2 +-
include/hw/pci/shpc.h | 2 +-
include/hw/qdev-core.h | 2 +-
hw/acpi/acpi-nvdimm-stub.c | 2 +-
hw/acpi/piix4.c | 2 +-
hw/core/hotplug.c | 2 +-
hw/pci-bridge/pci_bridge_dev.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pcie_port.c | 2 +-
hw/s390x/css-bridge.c | 2 +-
15 files changed, 14 insertions(+), 14 deletions(-)
rename include/hw/{ => core}/hotplug.h (100%)
diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
index 95dc58b5adb..a64d19445cc 100644
--- a/include/hw/acpi/cpu.h
+++ b/include/hw/acpi/cpu.h
@@ -17,7 +17,7 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/aml-build.h"
#include "hw/core/boards.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#define ACPI_CPU_HOTPLUG_REG_LEN 12
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 3b932abbbbe..5b670b04eb6 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -16,7 +16,7 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/pc-hotplug.h"
#include "hw/acpi/aml-build.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "hw/acpi/cpu.h"
typedef struct AcpiCpuHotplug {
diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
index ca6a2588258..efce5fd2e10 100644
--- a/include/hw/acpi/pcihp.h
+++ b/include/hw/acpi/pcihp.h
@@ -29,7 +29,7 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/aml-build.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"
#define ACPI_PCIHP_IO_LEN_PROP "acpi-pcihp-io-len"
diff --git a/include/hw/hotplug.h b/include/hw/core/hotplug.h
similarity index 100%
rename from include/hw/hotplug.h
rename to include/hw/core/hotplug.h
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ade2da92bad..b3a45ab71a8 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -9,7 +9,7 @@
#include "hw/block/flash.h"
#include "hw/i386/x86.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "qom/object.h"
#include "hw/i386/sgx-epc.h"
#include "hw/cxl/cxl.h"
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 42cebcd0338..c880ae1e04b 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -25,7 +25,7 @@
#include "hw/pci/pcie_regs.h"
#include "hw/pci/pcie_aer.h"
#include "hw/pci/pcie_sriov.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
typedef struct PCIEPort PCIEPort;
typedef struct PCIESlot PCIESlot;
diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index ad1089567a0..fce5bdd3bc7 100644
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -2,7 +2,7 @@
#define SHPC_H
#include "system/memory.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "hw/pci/pci_device.h"
#include "migration/vmstate.h"
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 018c134011e..8170836d432 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -7,7 +7,7 @@
#include "qemu/rcu.h"
#include "qemu/rcu_queue.h"
#include "qom/object.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "hw/irq.h"
#include "hw/resettable.h"
diff --git a/hw/acpi/acpi-nvdimm-stub.c b/hw/acpi/acpi-nvdimm-stub.c
index 65f491d6535..22ba17f5118 100644
--- a/hw/acpi/acpi-nvdimm-stub.c
+++ b/hw/acpi/acpi-nvdimm-stub.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "hw/mem/nvdimm.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev)
{
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 7a18f18dda2..9e0892a51f8 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -35,7 +35,7 @@
#include "qemu/range.h"
#include "hw/acpi/cpu_hotplug.h"
#include "hw/acpi/cpu.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "hw/mem/pc-dimm.h"
#include "hw/mem/nvdimm.h"
#include "hw/acpi/memory_hotplug.h"
diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c
index 17ac9866859..68aabad8ae0 100644
--- a/hw/core/hotplug.c
+++ b/hw/core/hotplug.c
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "qemu/module.h"
void hotplug_handler_pre_plug(HotplugHandler *plug_handler,
diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index b328e50ab31..cb4809f38b1 100644
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -30,7 +30,7 @@
#include "hw/qdev-properties.h"
#include "system/memory.h"
#include "hw/pci/pci_bus.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "qom/object.h"
#define TYPE_PCI_BRIDGE_DEV "pci-bridge"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index e03953813c2..02a59f355b6 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -45,7 +45,7 @@
#include "trace.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "hw/core/boards.h"
#include "hw/nvram/fw_cfg.h"
#include "qapi/error.h"
diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index f3841a26568..20b5e4cfb51 100644
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -22,7 +22,7 @@
#include "hw/pci/pcie_port.h"
#include "hw/qdev-properties.h"
#include "qemu/module.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
void pcie_port_init_reg(PCIDevice *d)
{
diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index 0f87b8c5c44..f3b6ef56300 100644
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hotplug.h"
+#include "hw/core/hotplug.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "qemu/bitops.h"
--
2.51.1
