Signed-off-by: Paolo Bonzini <[email protected]> --- MAINTAINERS | 2 +- docs/devel/clocks.rst | 2 +- include/hw/adc/npcm7xx_adc.h | 2 +- include/hw/arm/armsse.h | 2 +- include/hw/arm/armv7m.h | 2 +- include/hw/arm/msf2-soc.h | 2 +- include/hw/arm/nrf51_soc.h | 2 +- include/hw/arm/stm32f100_soc.h | 2 +- include/hw/arm/stm32f205_soc.h | 2 +- include/hw/{ => core}/clock.h | 0 include/hw/mips/cps.h | 2 +- include/hw/misc/npcm7xx_mft.h | 2 +- include/hw/misc/npcm7xx_pwm.h | 2 +- include/hw/misc/npcm_clk.h | 2 +- include/hw/qdev-clock.h | 2 +- include/hw/timer/armv7m_systick.h | 2 +- include/hw/timer/cmsdk-apb-dualtimer.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 2 +- include/hw/timer/stellaris-gptm.h | 2 +- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 +- rust/hw/core/wrapper.h | 2 +- target/mips/cpu.h | 2 +- target/xtensa/cpu.h | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/core/clock-vmstate.c | 2 +- hw/core/clock.c | 2 +- hw/core/ptimer.c | 2 +- hw/gpio/stm32l4x5_gpio.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/mips/jazz.c | 2 +- hw/mips/malta.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/stm32l4x5_syscfg.c | 2 +- hw/timer/sse-counter.c | 2 +- hw/timer/sse-timer.c | 2 +- system/qdev-monitor.c | 2 +- 36 files changed, 35 insertions(+), 35 deletions(-) rename include/hw/{ => core}/clock.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS index 4c3cfbc81a4..c464e7b5ea8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3951,7 +3951,7 @@ Clock framework M: Luc Michel <[email protected]> R: Damien Hedde <[email protected]> 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 3f744f2be1e..2dbdc668606 100644 --- 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/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index 93330a408d2..a0c56d42365 100644 --- 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 88b3b759c5a..04755ed1ec3 100644 --- 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 5c057ab2ec9..e31888cc8cd 100644 --- 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 9300664e8ea..510a91cd771 100644 --- 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 f88ab1b7d3e..94d7fc62ac4 100644 --- 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 a74d7b369c1..4c113d67748 100644 --- 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 46eda3403a9..d3de6b94dab 100644 --- 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 05ef9f76b74..e7309841d08 100644 --- 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 e4b997a6ad3..54a2c2a82e6 100644 --- 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 df927266209..f697a77cdca 100644 --- 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 52e972f4604..50b93a0094d 100644 --- 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 ffa0f7ba09e..af0d8499a67 100644 --- 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 ee09b138810..ac7de0a43ef 100644 --- 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 f3ec86c00b5..f098128a588 100644 --- 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 2dd615d1be9..74eaf611aeb 100644 --- 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 fde1fc6f0c7..c705508b829 100644 --- 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 c6b3e78731e..5bbf4979c9f 100644 --- 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 3bdbd1249e4..77b541f83f9 100644 --- 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/target/mips/cpu.h b/target/mips/cpu.h index 5cd4c6c818d..ed662135cb0 100644 --- 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 74122ebe15c..22192924841 100644 --- 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 { diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index afbe4bab29d..60d8ab5a0e5 100644 --- 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 e831fc596f8..9566d04cc64 100644 --- 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 9c906761e19..3fc98a0c65d 100644 --- 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 0aeb10fb53e..a7337f02b8d 100644 --- 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 414ce830390..42fe984c493 100644 --- 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 e777863703d..fa252c4b285 100644 --- 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 1708cec3f8c..fdcae4ce90e 100644 --- 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 f39e56d2798..44ae8bc6c72 100644 --- 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 0e1f27fbdda..514159777a0 100644 --- 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 4e21756e0b4..85be226d2f4 100644 --- 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 31f77acf61e..bb364e815be 100644 --- 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 866d5eef8af..c5fd038162b 100644 --- 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/system/qdev-monitor.c b/system/qdev-monitor.c index 3babf81e330..c8773d864d9 100644 --- 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" /* -- 2.51.1
