Signed-off-by: Paolo Bonzini <[email protected]> --- MAINTAINERS | 2 +- docs/devel/reset.rst | 2 +- include/hw/core/boards.h | 2 +- include/hw/core/qdev.h | 2 +- include/hw/{ => core}/resettable.h | 0 include/hw/virtio/virtio-balloon.h | 2 +- include/hw/virtio/virtio-mem.h | 2 +- include/system/reset.h | 2 +- hw/core/reset.c | 2 +- hw/core/resetcontainer.c | 2 +- hw/core/resettable.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/net/lan9118_phy.c | 2 +- hw/pci-host/fsl_imx8m_phy.c | 2 +- hw/rtc/rs5c372.c | 2 +- system/runstate.c | 2 +- target/s390x/cpu.c | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename include/hw/{ => core}/resettable.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS index b9cc00a5582..e34c3e6dac2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3961,7 +3961,7 @@ F: docs/devel/clocks.rst Reset framework M: Peter Maydell <[email protected]> S: Maintained -F: include/hw/resettable.h +F: include/hw/core/resettable.h F: include/hw/core/resetcontainer.h F: include/system/reset.h F: hw/core/reset.c diff --git a/docs/devel/reset.rst b/docs/devel/reset.rst index c02fe0a405c..91e8c21189e 100644 --- a/docs/devel/reset.rst +++ b/docs/devel/reset.rst @@ -4,7 +4,7 @@ Reset in QEMU: the Resettable interface ======================================= The reset of qemu objects is handled using the resettable interface declared -in ``include/hw/resettable.h``. +in ``include/hw/core/resettable.h``. This interface allows objects to be grouped (on a tree basis); so that the whole group can be reset consistently. Each individual member object does not diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index a48ed4f86a3..815845207b0 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -10,7 +10,7 @@ #include "qemu/module.h" #include "qom/object.h" #include "hw/core/cpu.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #define TYPE_MACHINE_SUFFIX "-machine" diff --git a/include/hw/core/qdev.h b/include/hw/core/qdev.h index da93611d373..0b62580a0fb 100644 --- a/include/hw/core/qdev.h +++ b/include/hw/core/qdev.h @@ -9,7 +9,7 @@ #include "qom/object.h" #include "hw/core/hotplug.h" #include "hw/core/irq.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" /** * DOC: The QEMU Device API diff --git a/include/hw/resettable.h b/include/hw/core/resettable.h similarity index 100% rename from include/hw/resettable.h rename to include/hw/core/resettable.h diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-balloon.h index 0456c211c6e..79ac194ccec 100644 --- a/include/hw/virtio/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -16,7 +16,7 @@ #define QEMU_VIRTIO_BALLOON_H #include "standard-headers/linux/virtio_balloon.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/virtio/virtio.h" #include "system/iothread.h" #include "qom/object.h" diff --git a/include/hw/virtio/virtio-mem.h b/include/hw/virtio/virtio-mem.h index e0ab31b45a4..221cfd76bf9 100644 --- a/include/hw/virtio/virtio-mem.h +++ b/include/hw/virtio/virtio-mem.h @@ -14,7 +14,7 @@ #define HW_VIRTIO_MEM_H #include "standard-headers/linux/virtio_mem.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/virtio/virtio.h" #include "qapi/qapi-types-misc.h" #include "system/hostmem.h" diff --git a/include/system/reset.h b/include/system/reset.h index 97131d94cfc..62e9977e3c2 100644 --- a/include/system/reset.h +++ b/include/system/reset.h @@ -27,7 +27,7 @@ #ifndef QEMU_SYSTEM_RESET_H #define QEMU_SYSTEM_RESET_H -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "qapi/qapi-events-run-state.h" typedef void QEMUResetHandler(void *opaque); diff --git a/hw/core/reset.c b/hw/core/reset.c index 65f82fa43d9..e7230b49b70 100644 --- a/hw/core/reset.c +++ b/hw/core/reset.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "system/reset.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/core/resetcontainer.h" /* diff --git a/hw/core/resetcontainer.c b/hw/core/resetcontainer.c index 5ff17002e75..ef84aa2374a 100644 --- a/hw/core/resetcontainer.c +++ b/hw/core/resetcontainer.c @@ -15,7 +15,7 @@ */ #include "qemu/osdep.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/core/resetcontainer.h" struct ResettableContainer { diff --git a/hw/core/resettable.c b/hw/core/resettable.c index 5cdb4a4f8d3..86e16c8c6e4 100644 --- a/hw/core/resettable.c +++ b/hw/core/resettable.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "trace.h" /** diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 072d6d98591..9bbf44def6b 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "target/arm/arm-powerctl.h" #include "target/arm/multiprocessing.h" diff --git a/hw/net/lan9118_phy.c b/hw/net/lan9118_phy.c index f0f6e55d807..2fc027d112c 100644 --- a/hw/net/lan9118_phy.c +++ b/hw/net/lan9118_phy.c @@ -16,7 +16,7 @@ #include "hw/net/lan9118_phy.h" #include "hw/net/mii.h" #include "hw/core/irq.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/pci-host/fsl_imx8m_phy.c b/hw/pci-host/fsl_imx8m_phy.c index 04da3f99a07..0afa6167e0d 100644 --- a/hw/pci-host/fsl_imx8m_phy.c +++ b/hw/pci-host/fsl_imx8m_phy.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "hw/pci-host/fsl_imx8m_phy.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/vmstate.h" #define CMN_REG075 0x1d4 diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c index 58f12b836d3..20015dd6c1e 100644 --- a/hw/rtc/rs5c372.c +++ b/hw/rtc/rs5c372.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "hw/core/qdev-properties.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/vmstate.h" #include "qemu/bcd.h" #include "qom/object.h" diff --git a/system/runstate.c b/system/runstate.c index 89bbfe7fbf9..ed2db564806 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -32,7 +32,7 @@ #include "exec/cpu-common.h" #include "gdbstub/syscalls.h" #include "hw/core/boards.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/misc.h" #include "migration/postcopy-ram.h" #include "monitor/monitor.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index da536fb30ed..6c4198eb1b1 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -32,7 +32,7 @@ #include "system/hw_accel.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" #include "system/tcg.h" -- 2.51.1
