include: move hw/qdev-clock.h to hw/core/

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

diff --git a/MAINTAINERS b/MAINTAINERS
index f44259b305fae75cfb76ff562af7bb6dd0d47407..41b536c3a2a48ab68e081c57045b54c72c4c614a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3952,7 +3952,7 @@ M: Luc Michel <luc@lmichel.fr>
 R: Damien Hedde <damien.hedde@dahe.fr>
 S: Maintained
 F: include/hw/core/clock.h
-F: include/hw/qdev-clock.h
+F: include/hw/core/qdev-clock.h
 F: hw/core/clock.c
 F: hw/core/clock-vmstate.c
 F: hw/core/qdev-clock.c

diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst
index 2dbdc668606f72432674cc3fb45542dd10644b95..16de32147b9efed0a135b6beff8593a3244d78cb 100644 (file)
--- a/docs/devel/clocks.rst
+++ b/docs/devel/clocks.rst
@@ -47,7 +47,7 @@ Here is an example of clocks::
                                                 +--------------+
 
 Clocks are defined in the ``include/hw/core/clock.h`` header and device
-related functions are defined in the ``include/hw/qdev-clock.h``
+related functions are defined in the ``include/hw/core/qdev-clock.h``
 header.
 
 The clock state
@@ -97,7 +97,7 @@ Note that it is possible to create a static array describing clock inputs and
 outputs. The function ``qdev_init_clocks()`` must be called with the array as
 parameter to initialize the clocks: it has the same behaviour as calling the
 ``qdev_init_clock_in/out()`` for each clock in the array. To ease the array
-construction, some macros are defined in ``include/hw/qdev-clock.h``.
+construction, some macros are defined in ``include/hw/core/qdev-clock.h``.
 As an example, the following creates 2 clocks to a device: one input and one
 output.
 

diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c
index ddb219d4562be11cbf95368d745d492d73678bc0..4494d5558f09df3b7189962a74b7ddc611b096f1 100644 (file)
--- a/hw/adc/npcm7xx_adc.c
+++ b/hw/adc/npcm7xx_adc.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/adc/npcm7xx_adc.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "migration/vmstate.h"

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index c0d99182bf9cacc65fa3d186779cafc70e899930..42ceb097ae896ab86fe8caef63f6d5261eeaa942 100644 (file)
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -23,7 +23,7 @@
 #include "hw/arm/armsse-version.h"
 #include "hw/arm/boot.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 
 /*
  * The SSE-300 puts some devices in different places to the

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 8198a83d15c8d9f90969ab8df2549a25d4a755eb..d9c7bcbcd71d272ecd2fd7d56ed2a3330027e378 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -14,7 +14,7 @@
 #include "hw/arm/boot.h"
 #include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "elf.h"
 #include "system/reset.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 3a5071a38413462bd35c7bb844e5e8f6fecc96ef..6199d2d2d7c02828d8d0c04e2d6331e915a4cc6e 100644 (file)
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -21,7 +21,7 @@
 #include "system/block-backend.h"
 #include "qemu/error-report.h"
 #include "qemu/units.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "system/system.h"
 
 static struct arm_boot_info aspeed_board_binfo = {

diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c
index ca487774aeed93f08dbb339fa41654626f95125b..f923b9505b78a73e7a13814d573618598bf09cef 100644 (file)
--- a/hw/arm/aspeed_ast10x0.c
+++ b/hw/arm/aspeed_ast10x0.c
@@ -13,7 +13,7 @@
 #include "qapi/error.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "hw/arm/aspeed_soc.h"
 

diff --git a/hw/arm/aspeed_ast10x0_evb.c b/hw/arm/aspeed_ast10x0_evb.c
index 7af2a77865e4414aa804984c4798386f2274f972..329578a542c37d45b4f3c5260f9dd7296fefe0c9 100644 (file)
--- a/hw/arm/aspeed_ast10x0_evb.c
+++ b/hw/arm/aspeed_ast10x0_evb.c
@@ -12,7 +12,7 @@
 #include "hw/arm/machines-qom.h"
 #include "hw/arm/aspeed.h"
 #include "hw/arm/aspeed_soc.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "system/system.h"
 #include "hw/i2c/smbus_eeprom.h"
 

diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c
index 1678cce416b647a44ab998cb002eaded8f4492d0..0502a137f3d9063b05f152257de5d3bf513059b3 100644 (file)
--- a/hw/arm/aspeed_ast27x0-fc.c
+++ b/hw/arm/aspeed_ast27x0-fc.c
@@ -16,7 +16,7 @@
 #include "system/system.h"
 #include "hw/arm/aspeed.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/core/loader.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/aspeed_ast27x0-ssp.c b/hw/arm/aspeed_ast27x0-ssp.c
index d12a9b8459c23235108859be2af8801f084a8d1d..04d37056596a550932418af02e3273031050ab1f 100644 (file)
--- a/hw/arm/aspeed_ast27x0-ssp.c
+++ b/hw/arm/aspeed_ast27x0-ssp.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/arm/aspeed_coprocessor.h"

diff --git a/hw/arm/aspeed_ast27x0-tsp.c b/hw/arm/aspeed_ast27x0-tsp.c
index 5b75e14206399f48b10ef9c93fab5e7c00d31715..f40c70fea54449c17f87a1539e6bd6e70d5f5ad9 100644 (file)
--- a/hw/arm/aspeed_ast27x0-tsp.c
+++ b/hw/arm/aspeed_ast27x0-tsp.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/arm/aspeed_coprocessor.h"

diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
index 3e036cfd2bafda2b8cc3b6a2c1cff7890d1e89d4..d3bfd2c7d26ab57622bef2454d3dcfdfb4655d0e 100644 (file)
--- a/hw/arm/fby35.c
+++ b/hw/arm/fby35.c
@@ -11,7 +11,7 @@
 #include "system/system.h"
 #include "system/block-backend.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/max78000_soc.c b/hw/arm/max78000_soc.c
index 7f1856f5ba1ea20baf349818ecf8c30293ed9c43..321e63723e3e74959c2b13af1a0fefb5d77f3d39 100644 (file)
--- a/hw/arm/max78000_soc.c
+++ b/hw/arm/max78000_soc.c
@@ -14,7 +14,7 @@
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "hw/arm/max78000_soc.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 
 static const uint32_t max78000_icc_addr[] = {0x4002a000, 0x4002a800};

diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c
index e4ceb7efcd5d62f77b7c01351b763ba8bf502844..4b6e76e46bbd1d6f281171890a9a1a7b39ad579a 100644 (file)
--- a/hw/arm/max78000fthr.c
+++ b/hw/arm/max78000fthr.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qemu/error-report.h"
 #include "hw/arm/max78000_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index c262a9c6795d911b2ecf9875708cf78cea8b606e..f101c1b7c3b704c31143f6dbfb1902bdae82883d 100644 (file)
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -73,7 +73,7 @@
 #include "hw/net/lan9118.h"
 #include "net/net.h"
 #include "hw/core/split-irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qom/object.h"
 #include "hw/core/irq.h"
 

diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index af3b0124891560c3454d9384b59543b5e6eba32a..7d2efc703bd764f44db3257160b3b8841efe32b1 100644 (file)
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -48,7 +48,7 @@
 #include "hw/net/lan9118.h"
 #include "net/net.h"
 #include "hw/watchdog/cmsdk-apb-watchdog.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qobject/qlist.h"
 #include "qom/object.h"
 

diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index c64e103f599b91437c603d725e80738f5486522b..77a0c0b7aff5ac373f505d4d958e846d8d3f854d 100644 (file)
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -33,7 +33,7 @@
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/core/or-irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/bsa.h"

diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index c5e9c7175a42a8d6d112f794ebb4a6489b9b602b..27d77af9dcd50790db638828826984a808bd7cc6 100644 (file)
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -29,7 +29,7 @@
 #include "hw/char/serial-mm.h"
 #include "hw/arm/msf2-soc.h"
 #include "hw/misc/unimp.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "system/system.h"
 
 #define MSF2_TIMER_BASE       0x40004000

diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index 78d98c4a4078334ff9dadcaf3abcbbc1da73f7bd..10382f0d3b2eb3db3fb52e844b319ab400d396c8 100644 (file)
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -33,7 +33,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "system/address-spaces.h"
 #include "hw/arm/msf2-soc.h"
 

diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index 7b30d9bd44698fc305477f422b13bfa488d824fc..75d82eebcacedae1d06e09a3154c7651fd132a4a 100644 (file)
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -34,7 +34,7 @@
 #include "hw/misc/tz-ppc.h"
 #include "hw/misc/unimp.h"
 #include "hw/rtc/pl031.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qom/object.h"
 
 #define MUSCA_NUMIRQ_MAX 96

diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index 1657612fe770a1032857a4febb46117586e0d355..c928105936590d93925536be490770ff32687339 100644 (file)
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f205_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c
index 746a3deef8ecaf954dad702e60a54ea84f301a8f..d64d2aefe462afcbc17d3565f61556986c7525e8 100644 (file)
--- a/hw/arm/netduinoplus2.c
+++ b/hw/arm/netduinoplus2.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f405_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index 6d6f67448690363ec6a723b94c1161e2def4a37f..6905e1d8a7dacb0a68e3262b632a815658c963f6 100644 (file)
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -21,7 +21,7 @@
 #include "hw/char/serial-mm.h"
 #include "hw/core/loader.h"
 #include "hw/misc/unimp.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "exec/tswap.h"

diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c
index 2bf5e132bb5366d6651f91d9379987868a0f0e4f..71e47dac2e1c933d50af14e3f411382c136faf0c 100644 (file)
--- a/hw/arm/npcm8xx.c
+++ b/hw/arm/npcm8xx.c
@@ -24,7 +24,7 @@
 #include "hw/intc/arm_gic.h"
 #include "hw/core/loader.h"
 #include "hw/misc/unimp.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/units.h"

diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index d8cc3214ed650fc250e87da2d8b5633376037cb9..a4ccfa373a63149dd6060ee92ea7972d0b180fb1 100644 (file)
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "hw/arm/boot.h"
 #include "hw/sysbus.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "qemu/log.h"
 

diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c
index d15545ff07a7f44d4759e487569d4f49045f93b4..1a08d742155f57a225681cdceae8f10c03e5e8eb 100644 (file)
--- a/hw/arm/olimex-stm32-h405.c
+++ b/hw/arm/olimex-stm32-h405.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f405_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 34cbcbe32c26d8a3e7262f280a36b5997d8d18ba..f3e8e15de81130746a034bf775676d0f8191b723 100644 (file)
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -31,7 +31,7 @@
 #include "migration/vmstate.h"
 #include "hw/misc/unimp.h"
 #include "hw/timer/stellaris-gptm.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qom/object.h"
 #include "qobject/qlist.h"
 #include "ui/input.h"

diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c
index 0702d51cc3e2badbeec3202c80d9066b8561bc5b..8d61be72c487037f9550351a367ab6fd608097a1 100644 (file)
--- a/hw/arm/stm32f100_soc.c
+++ b/hw/arm/stm32f100_soc.c
@@ -30,7 +30,7 @@
 #include "system/address-spaces.h"
 #include "hw/arm/stm32f100_soc.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "system/system.h"
 

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index e3c7203c6e7fc820861ef7ee190e8f1a978e6b6e..406f614f1d5e5022e2f91ba9774c81433e487e1a 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -29,7 +29,7 @@
 #include "system/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "system/system.h"
 
 /* At the moment only Timer 2 to 5 are modelled */

diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c
index c8684e2b4c5a73a5cddebc0ccd4aa97ee93cefdd..c2bc460603f96e7a5e78bb779a58d18bf29f6d35 100644 (file)
--- a/hw/arm/stm32f405_soc.c
+++ b/hw/arm/stm32f405_soc.c
@@ -27,7 +27,7 @@
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "hw/arm/stm32f405_soc.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 
 #define RCC_ADDR                       0x40023800

diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c
index c28ce15e6bb32b6de747026a5fbfb93665276429..39b8cdf97dcad6e47cf9420f82dfe8b906f03c24 100644 (file)
--- a/hw/arm/stm32l4x5_soc.c
+++ b/hw/arm/stm32l4x5_soc.c
@@ -30,7 +30,7 @@
 #include "hw/arm/stm32l4x5_soc.h"
 #include "hw/char/stm32l4x5_usart.h"
 #include "hw/gpio/stm32l4x5_gpio.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 
 #define FLASH_BASE_ADDRESS 0x08000000

diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c
index 4843c5565b65496efdf26ac5debb15b8c4a8d265..e7e1b8200e16687a5e7f9f36e130c25931c22c4e 100644 (file)
--- a/hw/arm/stm32vldiscovery.c
+++ b/hw/arm/stm32vldiscovery.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f100_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index e127b232d75cc09d562d2543e45c3f2e0449e79d..0d9c01e4b78a914fc95c03d46d734d358cd986ea 100644 (file)
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -34,7 +34,7 @@
 #include "hw/char/cadence_uart.h"
 #include "hw/net/cadence_gem.h"
 #include "hw/cpu/a9mpcore.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "system/reset.h"
 #include "qom/object.h"

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 738ba3114b909dad25c845805bb96cfacf06f6d2..58c4c95fdedde81cffda6ce5edd5e8bf9da11c35 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -31,7 +31,7 @@
 #include "qemu/module.h"
 #include "hw/char/cadence_uart.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties-system.h"
 #include "trace.h"
 

diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c
index db8525110919e77ebcfdd530e40df9ec4904b09d..23abeacb1b5ad32d9b93fbd114857bccd71ff122 100644 (file)
--- a/hw/char/ibex_uart.c
+++ b/hw/char/ibex_uart.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/ibex_uart.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/registerfields.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 75fdb8158e40cfaed9d888f10fa710d5654afb89..030d6a2e8b4e57b92f8381b7101e58088c5e78c7 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -23,7 +23,7 @@
 #include "hw/char/pl011.h"
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c
index ce4a35da8f492b0cd8f22a2b4219c4ff8fcc234c..4533cbc93beed20ddbd550b58b7f84ac2341935b 100644 (file)
--- a/hw/char/stm32l4x5_usart.c
+++ b/hw/char/stm32l4x5_usart.c
@@ -25,7 +25,7 @@
 #include "hw/char/stm32l4x5_usart.h"
 #include "hw/core/clock.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/registerfields.h"

diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c
index dacafa4e0369b6c8b91675317961df698c2e4347..b96525951cdafd3975e620e4ed72a508e27b5ee6 100644 (file)
--- a/hw/core/qdev-clock.c
+++ b/hw/core/qdev-clock.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-core.h"
 #include "qapi/error.h"
 

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index f9f56c66aecd53a173e98a6b6104a2721272de34..fae9ffc75952f6bc46060a5f7bbce3c725c26326 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -36,7 +36,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/sysbus.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c
index a5a38da63845b11f109a75baf568401914adeed1..5686bd53c23cc381f39195473c56e0f80f46b44a 100644 (file)
--- a/hw/gpio/stm32l4x5_gpio.c
+++ b/hw/gpio/stm32l4x5_gpio.c
@@ -21,7 +21,7 @@
 #include "hw/gpio/stm32l4x5_gpio.h"
 #include "hw/core/irq.h"
 #include "hw/core/clock.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "qapi/visitor.h"
 #include "qapi/error.h"

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index b4b4a86a5fa21e20c7633d0ccbccebb89dbfa579..b63b27d03fa584116ff1a476ba45f32cbf41a62a 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -30,7 +30,7 @@
 #include "hw/mips/bootloader.h"
 #include "hw/mips/cps.h"
 #include "hw/pci-host/xilinx-pcie.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/mips/cps.c b/hw/mips/cps.c
index e47695e2b0a6cca5bf8d7bb3216436350f14c492..13f048ef9c9211e622446eb9f39fcb3743549681 100644 (file)
--- a/hw/mips/cps.c
+++ b/hw/mips/cps.c
@@ -22,7 +22,7 @@
 #include "qemu/module.h"
 #include "hw/mips/cps.h"
 #include "hw/mips/mips.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "system/tcg.h"
 #include "system/reset.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 2b0eb8c478e9068d5369420f8ec1a14278732194..e5ed0b5692317d71651f80cf197f69d6c34091ed 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -58,7 +58,7 @@
 #include "system/kvm.h"
 #include "semihosting/semihost.h"
 #include "hw/mips/cps.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "target/mips/internal.h"
 #include "trace.h"
 #include "cpu.h"

diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c
index 514d29f2015cb526b634750655b4f93b38450bca..0bbae111cf95d940ddff233896ec443cadb73521 100644 (file)
--- a/hw/misc/npcm7xx_mft.c
+++ b/hw/misc/npcm7xx_mft.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/misc/npcm7xx_mft.h"
 #include "hw/misc/npcm7xx_pwm.h"

diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c
index 2e72d1c7d4fab7784d6fc984f6e9ab606c158de5..39ac0dbe2a54f329611a5e9d3fb3f8aab2319e3c 100644 (file)
--- a/hw/misc/npcm7xx_pwm.c
+++ b/hw/misc/npcm7xx_pwm.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/misc/npcm7xx_pwm.h"
 #include "hw/registerfields.h"

diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c
index e202a8a2998a3f24345db2460e83189795cd6781..bc9ee975de79908d49f8f8c5f265668fe25c06a6 100644 (file)
--- a/hw/misc/npcm_clk.c
+++ b/hw/misc/npcm_clk.c
@@ -18,7 +18,7 @@
 
 #include "hw/misc/npcm_clk.h"
 #include "hw/timer/npcm7xx_timer.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"

diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c
index d4af2cd69638672535707bea6936cbe72fd4b8e7..1b012d1cc1eb3406c6c239712b7fd343e3069dcc 100644 (file)
--- a/hw/misc/stm32l4x5_rcc.c
+++ b/hw/misc/stm32l4x5_rcc.c
@@ -25,7 +25,7 @@
 #include "hw/misc/stm32l4x5_rcc_internals.h"
 #include "hw/core/clock.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/registerfields.h"

diff --git a/hw/misc/stm32l4x5_syscfg.c b/hw/misc/stm32l4x5_syscfg.c
index de488a46780c9c9ae383be02294dfef081320697..52495610d1b909282e77972b62cfdf22f71f43d8 100644 (file)
--- a/hw/misc/stm32l4x5_syscfg.c
+++ b/hw/misc/stm32l4x5_syscfg.c
@@ -27,7 +27,7 @@
 #include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/core/clock.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qapi/error.h"
 #include "hw/misc/stm32l4x5_syscfg.h"
 #include "hw/gpio/stm32l4x5_gpio.h"

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index 010387beec46f994fb5b03504c0feadb709cc06c..cc18b21b22b2c1b046ebf9289a469ad43879e9f4 100644 (file)
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -22,7 +22,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qom/object.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"

diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
index 9eb39a6b84696be5d824e86f36e4b9fbee2af29e..704f4387684c89240737694ce4be9dba600e47ee 100644 (file)
--- a/hw/net/npcm7xx_emc.c
+++ b/hw/net/npcm7xx_emc.c
@@ -32,7 +32,7 @@
 #include <zlib.h> /* for crc32 */
 
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/net/npcm7xx_emc.h"
 #include "net/eth.h"

diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c
index c9e0f4c2e1703f9aba805efc1902831b87d940d9..baba0817b8f898363e442e01983ab735f201a542 100644 (file)
--- a/hw/timer/armv7m_systick.c
+++ b/hw/timer/armv7m_systick.c
@@ -14,7 +14,7 @@
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index 57fea11a8552dd26f35ea858828c38a73c55c1e0..5f4848ef6181e6ab25996890f624447d4bceb94c 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -25,7 +25,7 @@
 #include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/timer/cmsdk-apb-dualtimer.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c
index 8b7595731cc388c77ad8903ed96cf3f772af8909..d80bf1f96d0540fb0e72592717bcb17cf81cc3ce 100644 (file)
--- a/hw/timer/cmsdk-apb-timer.c
+++ b/hw/timer/cmsdk-apb-timer.c
@@ -35,7 +35,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/timer/cmsdk-apb-timer.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c
index e09e4ee03ad6e50f7c447d0f37112dc9f2ae45fd..0e62add74d32a2a6dc5087f0dd195c2fb2f971c1 100644 (file)
--- a/hw/timer/npcm7xx_timer.c
+++ b/hw/timer/npcm7xx_timer.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/core/irq.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/npcm7xx_timer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c
index bb364e815be9e44ceeceee2b51136517487752c9..de9d354483bc5d4140f0cc6760f61fa332357b13 100644 (file)
--- a/hw/timer/sse-counter.c
+++ b/hw/timer/sse-counter.c
@@ -35,7 +35,7 @@
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
 #include "hw/core/clock.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "migration/vmstate.h"
 
 /* Registers in the control frame */

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index fc48179d25d9870bf27de23cfa2f5021707b2689..1de882f3eb353027f470708888694832778f6b40 100644 (file)
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -44,7 +44,7 @@
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/core/clock.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/stellaris-gptm.c b/hw/timer/stellaris-gptm.c
index d97b2f8309c48e41d5d1907f984a577b78ac6c4e..37cd760318e92342c9fa18619d54f25904b65e93 100644 (file)
--- a/hw/timer/stellaris-gptm.c
+++ b/hw/timer/stellaris-gptm.c
@@ -12,7 +12,7 @@
 #include "qemu/timer.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/timer/stellaris-gptm.h"
 
 static void gptm_update_irq(gptm_state *s)

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index e1a2a33d73ec0a2d92651240bd6f7161b2a9007a..f1dd7d66eee14d1829ffd7b590b519657d9d1ead 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -30,7 +30,7 @@
 #include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/watchdog/cmsdk-apb-watchdog.h"
 #include "migration/vmstate.h"
 

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

diff --git a/include/hw/misc/bcm2835_cprman.h b/include/hw/misc/bcm2835_cprman.h
index 0d380367280dfeaa7ffd55a1c8e88f3f9f51de7e..7b2c0a5464247da75e199426c459890401a7cf5b 100644 (file)
--- a/include/hw/misc/bcm2835_cprman.h
+++ b/include/hw/misc/bcm2835_cprman.h
@@ -10,7 +10,7 @@
 #define HW_MISC_BCM2835_CPRMAN_H
 
 #include "hw/sysbus.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 
 #define TYPE_BCM2835_CPRMAN "bcm2835-cprman"
 

diff --git a/include/hw/net/xlnx-versal-canfd.h b/include/hw/net/xlnx-versal-canfd.h
index d2e582918fba4defaa3da33f8be8826270366f68..45cf0001c6b4db8a28de711c5768e8bcb593c3fe 100644 (file)
--- a/include/hw/net/xlnx-versal-canfd.h
+++ b/include/hw/net/xlnx-versal-canfd.h
@@ -31,7 +31,7 @@
 #include "hw/register.h"
 #include "hw/core/ptimer.h"
 #include "net/can_emu.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 
 #define TYPE_XILINX_CANFD "xlnx.versal-canfd"
 

diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-can.h
index 8262f11d33da5bf4ed75d2580af823a14163e050..d272f40ea80e26a75599e618c426b1d6b8886224 100644 (file)
--- a/include/hw/net/xlnx-zynqmp-can.h
+++ b/include/hw/net/xlnx-zynqmp-can.h
@@ -36,7 +36,7 @@
 #include "net/can_host.h"
 #include "qemu/fifo32.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 
 #define TYPE_XLNX_ZYNQMP_CAN "xlnx.zynqmp-can"
 

diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h
index e5c7e0518a5a30ffe226a5fd6e9f1ec0c2de1327..44f8583bff97ca90f5276ecbd11fd2ccfe6af9ed 100644 (file)
--- a/rust/hw/core/wrapper.h
+++ b/rust/hw/core/wrapper.h
@@ -26,7 +26,7 @@ typedef enum memory_order {
 
 #include "hw/sysbus.h"
 #include "hw/core/clock.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/core/irq.h"

diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 5989c3ba177825ae4eb40381067b454da3eb027d..894799c02c7d440e9aa841ace1c6562dadef14cc 100644 (file)
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -30,7 +30,7 @@
 #include "system/kvm.h"
 #include "system/qtest.h"
 #include "hw/qdev-properties.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "fpu_helper.h"
 #ifndef CONFIG_USER_ONLY
 #include "semihosting/semihost.h"

diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index 1eeed44e3366386b32a454a4b52a46c0350756f0..ecc5e093a40ab37d5899697bdb634bfc2125ba9f 100644 (file)
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -34,7 +34,7 @@
 #include "fpu/softfloat.h"
 #include "qemu/module.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-clock.h"
+#include "hw/core/qdev-clock.h"
 #include "accel/tcg/cpu-ops.h"
 #ifndef CONFIG_USER_ONLY
 #include "system/memory.h"