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

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

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

diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst
index 3f744f2be1e2ebfa26c435f2c281105173dde04c..2dbdc668606f72432674cc3fb45542dd10644b95 100644 (file)
--- a/docs/devel/clocks.rst
+++ b/docs/devel/clocks.rst
@@ -46,7 +46,7 @@ Here is an example of clocks::
                                                 | +-------+    |
                                                 +--------------+
 
-Clocks are defined in the ``include/hw/clock.h`` header and device
+Clocks are defined in the ``include/hw/core/clock.h`` header and device
 related functions are defined in the ``include/hw/qdev-clock.h``
 header.
 

diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c
index afbe4bab29d727ab111cf655d6fbdc8fd591cb38..60d8ab5a0e5603527e59e570ae2a970f36cd1872 100644 (file)
--- a/hw/char/stm32l4x5_usart.c
+++ b/hw/char/stm32l4x5_usart.c
@@ -23,7 +23,7 @@
 #include "chardev/char-serial.h"
 #include "migration/vmstate.h"
 #include "hw/char/stm32l4x5_usart.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/core/clock-vmstate.c b/hw/core/clock-vmstate.c
index e831fc596f8c553075d0067d26edc08458f8d837..9566d04cc64d4b9cb70119f6048ebd5be173bd21 100644 (file)
--- a/hw/core/clock-vmstate.c
+++ b/hw/core/clock-vmstate.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "migration/vmstate.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 static bool muldiv_needed(void *opaque)
 {

diff --git a/hw/core/clock.c b/hw/core/clock.c
index 9c906761e197cd59ba8fba6cacaa0c55eaf2e69a..3fc98a0c65d5299fc9ab1c6ecf2f9e7ec48fd1ac 100644 (file)
--- a/hw/core/clock.c
+++ b/hw/core/clock.c
@@ -15,7 +15,7 @@
 #include "qemu/cutils.h"
 #include "qapi/visitor.h"
 #include "system/qtest.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "trace.h"
 
 #define CLOCK_PATH(_clk) (_clk->canonical_path)

diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 0aeb10fb53e9e4e4b38f890cc75934360635a5d1..a7337f02b8dbd36eff059a40f58bf0dbcfeaff03 100644 (file)
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -14,7 +14,7 @@
 #include "exec/icount.h"
 #include "system/qtest.h"
 #include "block/aio.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 #define DELTA_ADJUST     1
 #define DELTA_NO_ADJUST -1

diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c
index 414ce8303902aa9341450db396711833c53e6414..42fe984c493527ec850ee08fc495a13f7c9cc810 100644 (file)
--- a/hw/gpio/stm32l4x5_gpio.c
+++ b/hw/gpio/stm32l4x5_gpio.c
@@ -20,7 +20,7 @@
 #include "qemu/log.h"
 #include "hw/gpio/stm32l4x5_gpio.h"
 #include "hw/irq.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "qapi/visitor.h"

diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index e777863703d30cab770e5b5c0bfa2302cdf8c156..fa252c4b2850c0031e9652b45c672e313b9e132d 100644 (file)
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -23,7 +23,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "net/net.h"
 #include "hw/core/boards.h"
 #include "hw/i2c/smbus_eeprom.h"

diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 1708cec3f8ca6d67542ef66f37941cc5e344df75..fdcae4ce90e790b89bdbc340eed8999c18f8d6d6 100644 (file)
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/mips/mips.h"
 #include "hw/intc/i8259.h"
 #include "hw/dma/i8257.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index f39e56d279850c2252eafdc379667c58b8f5e17e..44ae8bc6c72591b555913b1f951040a2d35397cf 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -29,7 +29,7 @@
 #include "qemu/cutils.h"
 #include "qemu/guest-random.h"
 #include "exec/tswap.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/southbridge/piix.h"
 #include "hw/isa/superio.h"
 #include "hw/char/serial-mm.h"

diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c
index 0e1f27fbddabaff12381870661ceb20b4610d9cf..514159777a02432547400e3007655873680baf7f 100644 (file)
--- a/hw/misc/stm32l4x5_rcc.c
+++ b/hw/misc/stm32l4x5_rcc.c
@@ -23,7 +23,7 @@
 #include "migration/vmstate.h"
 #include "hw/misc/stm32l4x5_rcc.h"
 #include "hw/misc/stm32l4x5_rcc_internals.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/misc/stm32l4x5_syscfg.c b/hw/misc/stm32l4x5_syscfg.c
index 4e21756e0b46cdfc2ce46c4532b6f2ad66e76401..85be226d2f40973b5967b1e2b966550e77119ba5 100644 (file)
--- a/hw/misc/stm32l4x5_syscfg.c
+++ b/hw/misc/stm32l4x5_syscfg.c
@@ -26,7 +26,7 @@
 #include "trace.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/qdev-clock.h"
 #include "qapi/error.h"
 #include "hw/misc/stm32l4x5_syscfg.h"

diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c
index 31f77acf61e0f78e4a3b8a2ed809e5b30d2fb965..bb364e815be9e44ceeceee2b51136517487752c9 100644 (file)
--- a/hw/timer/sse-counter.c
+++ b/hw/timer/sse-counter.c
@@ -34,7 +34,7 @@
 #include "hw/timer/sse-counter.h"
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/qdev-clock.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index 866d5eef8afe2c6b4e150ab39d434a48530a7335..c5fd038162b74bec13ec0760d3a48706fc1b34da 100644 (file)
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -43,7 +43,7 @@
 #include "hw/sysbus.h"
 #include "hw/irq.h"
 #include "hw/registerfields.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h
index 93330a408d2ba61d4a088f1f48a52228c0a0ecb6..a0c56d42365ee5b177a56422593e3dbf39f9cb26 100644 (file)
--- a/include/hw/adc/npcm7xx_adc.h
+++ b/include/hw/adc/npcm7xx_adc.h
@@ -16,7 +16,7 @@
 #ifndef NPCM7XX_ADC_H
 #define NPCM7XX_ADC_H
 
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"

diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h
index 88b3b759c5a8d68a653cfda46684b383aebba09e..04755ed1ec3725b80003ac62ed12e455475da20e 100644 (file)
--- a/include/hw/arm/armsse.h
+++ b/include/hw/arm/armsse.h
@@ -110,7 +110,7 @@
 #include "hw/misc/armsse-cpu-pwrctrl.h"
 #include "hw/misc/unimp.h"
 #include "hw/or-irq.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/core/split-irq.h"
 #include "hw/cpu/cluster.h"
 #include "qom/object.h"

diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h
index 5c057ab2ec9e2ddbeacdf8b993bbf4f4c65354b4..e31888cc8cd07a5d7b5e36c779b142b7f56648d3 100644 (file)
--- a/include/hw/arm/armv7m.h
+++ b/include/hw/arm/armv7m.h
@@ -15,7 +15,7 @@
 #include "hw/misc/armv7m_ras.h"
 #include "target/arm/idau.h"
 #include "qom/object.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 #define TYPE_BITBAND "ARM-bitband-memory"
 OBJECT_DECLARE_SIMPLE_TYPE(BitBandState, BITBAND)

diff --git a/include/hw/arm/msf2-soc.h b/include/hw/arm/msf2-soc.h
index 9300664e8ea31be0d12ea457b59a5bbaf5cd0327..510a91cd771beb257a1bb597958320f024ce2bbf 100644 (file)
--- a/include/hw/arm/msf2-soc.h
+++ b/include/hw/arm/msf2-soc.h
@@ -30,7 +30,7 @@
 #include "hw/misc/msf2-sysreg.h"
 #include "hw/ssi/mss-spi.h"
 #include "hw/net/msf2-emac.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "qom/object.h"
 
 #define TYPE_MSF2_SOC     "msf2-soc"

diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h
index f88ab1b7d3ec5b1d2d6ffa4a978e4b12fd697d37..94d7fc62ac427c466b0af9487708b8ac56da1431 100644 (file)
--- a/include/hw/arm/nrf51_soc.h
+++ b/include/hw/arm/nrf51_soc.h
@@ -17,7 +17,7 @@
 #include "hw/gpio/nrf51_gpio.h"
 #include "hw/nvram/nrf51_nvm.h"
 #include "hw/timer/nrf51_timer.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "qom/object.h"
 
 #define TYPE_NRF51_SOC "nrf51-soc"

diff --git a/include/hw/arm/stm32f100_soc.h b/include/hw/arm/stm32f100_soc.h
index a74d7b369c1bd1e8701e889326bc9d36a505a1d9..4c113d6774842b5d3401d9f503a69c659fb4d3ca 100644 (file)
--- a/include/hw/arm/stm32f100_soc.h
+++ b/include/hw/arm/stm32f100_soc.h
@@ -29,7 +29,7 @@
 #include "hw/ssi/stm32f2xx_spi.h"
 #include "hw/arm/armv7m.h"
 #include "qom/object.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 #define TYPE_STM32F100_SOC "stm32f100-soc"
 OBJECT_DECLARE_SIMPLE_TYPE(STM32F100State, STM32F100_SOC)

diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h
index 46eda3403a9397422eda1e9118b00e5a70e2af38..d3de6b94dab501791f1d1baa8a27d55199fb9197 100644 (file)
--- a/include/hw/arm/stm32f205_soc.h
+++ b/include/hw/arm/stm32f205_soc.h
@@ -32,7 +32,7 @@
 #include "hw/or-irq.h"
 #include "hw/ssi/stm32f2xx_spi.h"
 #include "hw/arm/armv7m.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "qom/object.h"
 
 #define TYPE_STM32F205_SOC "stm32f205-soc"

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

diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h
index 05ef9f76b747a543a0d8af80cf9fffa7d7790d9d..e7309841d084316d98aaa9821bef5f8e11e6e880 100644 (file)
--- a/include/hw/mips/cps.h
+++ b/include/hw/mips/cps.h
@@ -21,7 +21,7 @@
 #define MIPS_CPS_H
 
 #include "hw/sysbus.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/misc/mips_cmgcr.h"
 #include "hw/intc/mips_gic.h"
 #include "hw/misc/mips_cpc.h"

diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h
index e4b997a6ad38f0e146b8de29f199a3801e53116a..54a2c2a82e64f95f8680f08ad5ddeff3bec87997 100644 (file)
--- a/include/hw/misc/npcm7xx_mft.h
+++ b/include/hw/misc/npcm7xx_mft.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_MFT_H
 
 #include "system/memory.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "qom/object.h"

diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h
index df927266209494f90cf0715f2db5a1ad07ec9f2a..f697a77cdcab3f70e3ec24204573fb91de617934 100644 (file)
--- a/include/hw/misc/npcm7xx_pwm.h
+++ b/include/hw/misc/npcm7xx_pwm.h
@@ -16,7 +16,7 @@
 #ifndef NPCM7XX_PWM_H
 #define NPCM7XX_PWM_H
 
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/sysbus.h"
 #include "hw/irq.h"
 

diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h
index 52e972f4604e691a5c8f77ea2034895b5f48e255..50b93a0094d98bef83bd6732539f8ebfcc0685fa 100644 (file)
--- a/include/hw/misc/npcm_clk.h
+++ b/include/hw/misc/npcm_clk.h
@@ -17,7 +17,7 @@
 #define NPCM_CLK_H
 
 #include "system/memory.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/sysbus.h"
 
 #define NPCM7XX_CLK_NR_REGS             (0x70 / sizeof(uint32_t))

diff --git a/include/hw/qdev-clock.h b/include/hw/qdev-clock.h
index ffa0f7ba09e08c22858736763986365f5ff34702..af0d8499a675023d813c9d77148944ab3cbc3b35 100644 (file)
--- a/include/hw/qdev-clock.h
+++ b/include/hw/qdev-clock.h
@@ -14,7 +14,7 @@
 #ifndef QDEV_CLOCK_H
 #define QDEV_CLOCK_H
 
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 /**
  * qdev_init_clock_in:

diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_systick.h
index ee09b1388106d26460dfaf3c0eb271c71e2b9cbc..ac7de0a43ef2cd98871052bf94bbecdcb07de13e 100644 (file)
--- a/include/hw/timer/armv7m_systick.h
+++ b/include/hw/timer/armv7m_systick.h
@@ -15,7 +15,7 @@
 #include "hw/sysbus.h"
 #include "qom/object.h"
 #include "hw/ptimer.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 #define TYPE_SYSTICK "armv7m_systick"
 

diff --git a/include/hw/timer/cmsdk-apb-dualtimer.h b/include/hw/timer/cmsdk-apb-dualtimer.h
index f3ec86c00b5f3a92d4c083ae2c3cf349b26b72fc..f098128a58834828dfa64c0646b679540ba2ba70 100644 (file)
--- a/include/hw/timer/cmsdk-apb-dualtimer.h
+++ b/include/hw/timer/cmsdk-apb-dualtimer.h
@@ -28,7 +28,7 @@
 
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "qom/object.h"
 
 #define TYPE_CMSDK_APB_DUALTIMER "cmsdk-apb-dualtimer"

diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h
index 2dd615d1be9b11384b60c68f7f8edf84467724d5..74eaf611aebbf26c4c7b97106c7b8f6f8a6ce605 100644 (file)
--- a/include/hw/timer/cmsdk-apb-timer.h
+++ b/include/hw/timer/cmsdk-apb-timer.h
@@ -14,7 +14,7 @@
 
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "qom/object.h"
 
 #define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer"

diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris-gptm.h
index fde1fc6f0c776abb4f5ad264c8324156f2afd62a..c705508b8295d9e2aebd9a0758d552018f953a76 100644 (file)
--- a/include/hw/timer/stellaris-gptm.h
+++ b/include/hw/timer/stellaris-gptm.h
@@ -13,7 +13,7 @@
 #include "qom/object.h"
 #include "hw/sysbus.h"
 #include "hw/irq.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 
 #define TYPE_STELLARIS_GPTM "stellaris-gptm"
 OBJECT_DECLARE_SIMPLE_TYPE(gptm_state, STELLARIS_GPTM)

diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog/cmsdk-apb-watchdog.h
index c6b3e78731edcfeadc2d6e889dbfe190e91f69bb..5bbf4979c9f832d59933eb917dc93ea474d3afd4 100644 (file)
--- a/include/hw/watchdog/cmsdk-apb-watchdog.h
+++ b/include/hw/watchdog/cmsdk-apb-watchdog.h
@@ -33,7 +33,7 @@
 
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "qom/object.h"
 
 #define TYPE_CMSDK_APB_WATCHDOG "cmsdk-apb-watchdog"

diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h
index 3bdbd1249e41d0dd99a51f9f721852d7cc52b68e..77b541f83f9df54833b207c90c5d3a7aaee0ccc9 100644 (file)
--- a/rust/hw/core/wrapper.h
+++ b/rust/hw/core/wrapper.h
@@ -25,7 +25,7 @@ typedef enum memory_order {
 #include "qemu/osdep.h"
 
 #include "hw/sysbus.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index 3babf81e3306024bab223513b4562cfe110e46cb..c8773d864d923b5c337537bfa31ec95fbedeb3ea 100644 (file)
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -41,7 +41,7 @@
 #include "migration/misc.h"
 #include "qemu/cutils.h"
 #include "hw/qdev-properties.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "hw/core/boards.h"
 
 /*

diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 5cd4c6c818d01e5cfba29ab2d78b16e572b1aa14..ed662135cb073e618c29f0aa9de46e6879ebd6f7 100644 (file)
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -9,7 +9,7 @@
 #include "system/memory.h"
 #endif
 #include "fpu/softfloat-types.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "mips-defs.h"
 
 typedef struct CPUMIPSTLBContext CPUMIPSTLBContext;

diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index 74122ebe15c466cd362efce766c1ddecfd58d2fb..22192924841ee2707be14d1f76b2496214b76884 100644 (file)
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -33,7 +33,7 @@
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
-#include "hw/clock.h"
+#include "hw/core/clock.h"
 #include "xtensa-isa.h"
 
 enum {