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

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

diff --git a/MAINTAINERS b/MAINTAINERS
index b38215954a293f22fe66e97514a99c5e94e6768f..e241690bdcee9549a80dde653e6c74e7f244d135 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3961,7 +3961,7 @@ F: docs/devel/clocks.rst
 Reset framework
 M: Peter Maydell <peter.maydell@linaro.org>
 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 c02fe0a405c606c2afdc0960fc62a4d8568565fa..91e8c21189e03d1b8548f9f6d17e8b56754019a3 100644 (file)
--- 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/hw/core/reset.c b/hw/core/reset.c
index 65f82fa43d99335986b41c08b6329069378a5e2e..e7230b49b7044d2a3412617b286d6dff469b50fa 100644 (file)
--- 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 5ff17002e75ae26311b6faf1c53beff468744309..ef84aa2374a536fd91c6a7b13ec3cb2dc6688d2b 100644 (file)
--- 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 5cdb4a4f8d3877d7d0ee14ecb5396450c85cb243..86e16c8c6e4011d61f5bad924a6a04760a7584ff 100644 (file)
--- 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 072d6d9859177894a7cef2f7710af8c33bd4e196..9bbf44def6bf386d840e0b9fea4406115afb9a94 100644 (file)
--- 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 f0f6e55d807875beb2888befdfdabe0d9df058a3..2fc027d112cc0588b0998ab4942c8f4df80534eb 100644 (file)
--- 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 04da3f99a07e89c171bb2252b3d7f68ab8ddbf1c..0afa6167e0d581cb0a9e81b79d925c8184ae4e30 100644 (file)
--- 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 58f12b836d39d6a7f23ccc1c3fb42198648c5e07..20015dd6c1e265665e7ce71341b271c4b2f8b511 100644 (file)
--- 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/include/hw/core/boards.h b/include/hw/core/boards.h
index a48ed4f86a3536d2e54bc90c776262f1dae049f2..815845207b01784abddbbf2b2c41817058569df4 100644 (file)
--- 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 f0ef2dc3aa84a0bb72991fb591861a04ed79ef06..e211d807e82b043e6cd5eda5a47fa61ab1ea59d2 100644 (file)
--- a/include/hw/core/qdev.h
+++ b/include/hw/core/qdev.h
@@ -8,7 +8,7 @@
 #include "qemu/rcu_queue.h"
 #include "qom/object.h"
 #include "hw/core/hotplug.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 0456c211c6e6023da14b6bb3349b9dcf62d1605e..79ac194ccec87fe6dba1471014eda10702453a78 100644 (file)
--- 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 e0ab31b45a498854c1f1467133946ffca06a7510..221cfd76bf95652e2b003f6e97aa0e2bdce52768 100644 (file)
--- 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 97131d94cfc484323ce89efb84d45e35ad268ed9..62e9977e3c295b919c0cfae5980f88d9bce55719 100644 (file)
--- 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/system/runstate.c b/system/runstate.c
index 89bbfe7fbf93c413327d15b3db5de6f83676513a..ed2db564806abfdcd961e162d5df6b0cd53372a2 100644 (file)
--- 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 da536fb30ed8f530e16366e13d88567cd514d512..6c4198eb1b1c2609d34619ea470d939ae2025cb7 100644 (file)
--- 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"