include: move hw/platform-bus.h to hw/core/

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

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 200e2a1da708b48af364e14eca58ba09ffdf3521..03b43425746351f1fbc1cbe074cb24aa84909d98 100644 (file)
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -54,7 +54,7 @@
 #include "hw/arm/virt.h"
 #include "hw/intc/arm_gicv3_its_common.h"
 #include "hw/mem/nvdimm.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "system/numa.h"
 #include "system/reset.h"
 #include "system/tpm.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index c005eb914cb9e8b11af7214c3b61b02ae1950554..0d2652e6dbc8a8d7a14e92e5b37fc3ad55fae0ab 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -62,7 +62,7 @@
 #include "hw/pci-bridge/pci_expander_bridge.h"
 #include "hw/virtio/virtio-pci.h"
 #include "hw/core/sysbus-fdt.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/fdt.h"
 #include "hw/intc/arm_gic.h"

diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 6950063de4f7ec6d03d5eeba9985f3806548b22c..4b6cc5f6498dfc7fda68ecc7e913f5c804ce8908 100644 (file)
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/core/sysbus-fdt.c b/hw/core/sysbus-fdt.c
index 59f1d17de112c8d5cfeada17c124930fb725cb25..89d0c464454abb7aaf78feea61bfb9c7e55eb026 100644 (file)
--- a/hw/core/sysbus-fdt.c
+++ b/hw/core/sysbus-fdt.c
@@ -32,7 +32,7 @@
 #include "system/device_tree.h"
 #include "system/tpm.h"
 #include "hw/arm/smmuv3.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "hw/display/ramfb.h"
 #include "hw/uefi/var-service-api.h"
 #include "hw/arm/fdt.h"

diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
index 3694c9827f0456d845fabb846fe7aa9eff8060ac..8ff9ebdcd9ed013cf86ab7f8bb2d666f1227705c 100644 (file)
--- a/hw/loongarch/virt-acpi-build.c
+++ b/hw/loongarch/virt-acpi-build.c
@@ -32,7 +32,7 @@
 #include "hw/pci-host/gpex.h"
 #include "system/system.h"
 #include "system/tpm.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/hmat.h"
 

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index ea53941aeb9d1b3a8b4bceabdb5a99899dc4295f..6efa15da473737dbbe5b3be54847b6b1874386cf 100644 (file)
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -37,7 +37,7 @@
 #include "qapi/qapi-visit-common.h"
 #include "hw/acpi/generic_event_device.h"
 #include "hw/mem/nvdimm.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "hw/display/ramfb.h"
 #include "hw/uefi/var-service-api.h"
 #include "hw/mem/pc-dimm.h"

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 769f18023d51d78507e11708e2578ad5d25a4a12..7c65757e2155efba0ba3b994280fcde8887095e3 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -46,7 +46,7 @@
 #include "qemu/option.h"
 #include "hw/pci-host/ppce500.h"
 #include "qemu/error-report.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "hw/net/fsl_etsec/etsec.h"
 #include "hw/i2c/i2c.h"
 #include "hw/core/irq.h"

diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h
index cda539bda180aaa9d23c8989e4c1ff07ace10001..11f8ae531778f90ffef51e2ade43d387c9151e81 100644 (file)
--- a/hw/ppc/e500.h
+++ b/hw/ppc/e500.h
@@ -2,7 +2,7 @@
 #define PPCE500_H
 
 #include "hw/core/boards.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "qom/object.h"
 
 #define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000)

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 0505bffa44a276786fb60af8db0027e33548e2cb..9cb4f16432e9a6de050584f08ac2df9c62857d39 100644 (file)
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -43,7 +43,7 @@
 #include "hw/intc/riscv_aplic.h"
 #include "hw/intc/sifive_plic.h"
 #include "hw/misc/sifive_test.h"
-#include "hw/platform-bus.h"
+#include "hw/core/platform-bus.h"
 #include "chardev/char.h"
 #include "system/device_tree.h"
 #include "system/system.h"

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