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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
4 months ago · a5d7e646f6
38 changed files with 37 additions and 37 deletions
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@ -21,7 +21,7 @@
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "qemu/timer.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/block/flash.h"
 #include "ui/console.h"
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@ -7,7 +7,7 @@
 */

 #include "qemu/osdep.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "migration/vmstate.h"
 #include "qemu/host-utils.h"
 #include "exec/replay-core.h"
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@ -28,7 +28,7 @@
 #include "qemu/timer.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/stream.h"
 #include "hw/register.h"
 #include "hw/dma/xlnx_csu_dma.h"
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@ -15,7 +15,7 @@
 #include "hw/core/irq.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "system/system.h"
 #include "hw/sysbus.h"

--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@ -25,7 +25,7 @@
 #include "hw/m68k/mcf.h"
 #include "hw/m68k/mcf_fec.h"
 #include "qemu/timer.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "system/system.h"
 #include "system/qtest.h"
 #include "net/net.h"
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@ -30,7 +30,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/net/mii.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "etsec.h"
 #include "registers.h"
--- a/hw/net/fsl_etsec/etsec.h
+++ b/hw/net/fsl_etsec/etsec.h
@ -27,7 +27,7 @@

 #include "hw/sysbus.h"
 #include "net/net.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "qom/object.h"

 /* Buffer Descriptors */
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@ -18,7 +18,7 @@
 #include "hw/core/irq.h"
 #include "hw/net/lan9118_phy.h"
 #include "hw/net/lan9118.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/bswap.h"
--- a/hw/rtc/exynos4210_rtc.c
+++ b/hw/rtc/exynos4210_rtc.c
@ -32,7 +32,7 @@
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/bcd.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"

 #include "hw/core/irq.h"

--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@ -32,7 +32,7 @@
 #include "cpu.h"
 #include "hw/core/irq.h"
 #include "qemu/timer.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "system/system.h"
 #include "system/qtest.h"
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/arm_mptimer.h"
 #include "migration/vmstate.h"
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@ -12,7 +12,7 @@
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/module.h"
 #include "qemu/log.h"
--- a/hw/timer/digic-timer.c
+++ b/hw/timer/digic-timer.c
@ -28,7 +28,7 @@

 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "qemu/module.h"
 #include "qemu/log.h"

--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@ -58,7 +58,7 @@
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/module.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"

 #include "hw/arm/exynos4210.h"
 #include "hw/core/irq.h"
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@ -26,7 +26,7 @@
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/module.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"

 #include "hw/arm/exynos4210.h"
 #include "hw/core/irq.h"
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@ -29,7 +29,7 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/module.h"

--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@ -14,7 +14,7 @@
 #include "hw/core/irq.h"
 #include "hw/sh4/sh.h"
 #include "hw/timer/tmu012.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "trace.h"

 #define TIMER_TCR_TPSC          (7 << 0)
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"
--- a/include/hw/core/ptimer.h
+++ b/include/hw/core/ptimer.h
--- a/include/hw/display/xlnx_dp.h
+++ b/include/hw/display/xlnx_dp.h
@ -35,7 +35,7 @@
 #include "hw/dma/xlnx_dpdma.h"
 #include "qemu/audio.h"
 #include "qom/object.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"

 #define AUD_CHBUF_MAX_DEPTH                 (32 * KiB)
 #define MAX_QEMU_BUFFER_SIZE                (4 * KiB)
--- a/include/hw/dma/xlnx_csu_dma.h
+++ b/include/hw/dma/xlnx_csu_dma.h
@ -23,7 +23,7 @@

 #include "hw/sysbus.h"
 #include "hw/register.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/stream.h"

 #define TYPE_XLNX_CSU_DMA "xlnx.csu_dma"
--- a/include/hw/net/xlnx-versal-canfd.h
+++ b/include/hw/net/xlnx-versal-canfd.h
@ -29,7 +29,7 @@
 #define HW_CANFD_XILINX_H

 #include "hw/register.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "net/can_emu.h"
 #include "hw/qdev-clock.h"

--- a/include/hw/net/xlnx-zynqmp-can.h
+++ b/include/hw/net/xlnx-zynqmp-can.h
@ -35,7 +35,7 @@
 #include "net/can_emu.h"
 #include "net/can_host.h"
 #include "qemu/fifo32.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/qdev-clock.h"

 #define TYPE_XLNX_ZYNQMP_CAN "xlnx.zynqmp-can"
--- a/include/hw/timer/allwinner-a10-pit.h
+++ b/include/hw/timer/allwinner-a10-pit.h
@ -1,7 +1,7 @@
 #ifndef ALLWINNER_A10_PIT_H
 #define ALLWINNER_A10_PIT_H

-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/sysbus.h"
 #include "qom/object.h"

--- a/include/hw/timer/armv7m_systick.h
+++ b/include/hw/timer/armv7m_systick.h
@ -14,7 +14,7 @@

 #include "hw/sysbus.h"
 #include "qom/object.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/core/clock.h"

 #define TYPE_SYSTICK "armv7m_systick"
--- a/include/hw/timer/cmsdk-apb-dualtimer.h
+++ b/include/hw/timer/cmsdk-apb-dualtimer.h
@ -27,7 +27,7 @@
 #define CMSDK_APB_DUALTIMER_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/core/clock.h"
 #include "qom/object.h"

--- a/include/hw/timer/cmsdk-apb-timer.h
+++ b/include/hw/timer/cmsdk-apb-timer.h
@ -13,7 +13,7 @@
 #define CMSDK_APB_TIMER_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/core/clock.h"
 #include "qom/object.h"

--- a/include/hw/timer/digic-timer.h
+++ b/include/hw/timer/digic-timer.h
@ -19,7 +19,7 @@
 #define HW_TIMER_DIGIC_TIMER_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "qom/object.h"

 #define TYPE_DIGIC_TIMER "digic-timer"
--- a/include/hw/timer/imx_epit.h
+++ b/include/hw/timer/imx_epit.h
@ -30,7 +30,7 @@
 #define IMX_EPIT_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/misc/imx_ccm.h"
 #include "qom/object.h"

--- a/include/hw/timer/imx_gpt.h
+++ b/include/hw/timer/imx_gpt.h
@ -30,7 +30,7 @@
 #define IMX_GPT_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/misc/imx_ccm.h"
 #include "qom/object.h"

--- a/include/hw/timer/mss-timer.h
+++ b/include/hw/timer/mss-timer.h
@ -26,7 +26,7 @@
 #define HW_MSS_TIMER_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "qom/object.h"

 #define TYPE_MSS_TIMER     "mss-timer"
--- a/include/hw/watchdog/allwinner-wdt.h
+++ b/include/hw/watchdog/allwinner-wdt.h
@ -24,7 +24,7 @@
 #define HW_WATCHDOG_ALLWINNER_WDT_H

 #include "qom/object.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/sysbus.h"

 /*
--- a/include/hw/watchdog/cmsdk-apb-watchdog.h
+++ b/include/hw/watchdog/cmsdk-apb-watchdog.h
@ -32,7 +32,7 @@
 #define CMSDK_APB_WATCHDOG_H

 #include "hw/sysbus.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "hw/core/clock.h"
 #include "qom/object.h"

--- a/include/hw/watchdog/wdt_imx2.h
+++ b/include/hw/watchdog/wdt_imx2.h
@ -15,7 +15,7 @@
 #include "qemu/bitops.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"
 #include "qom/object.h"

 #define TYPE_IMX2_WDT "imx2.wdt"
--- a/tests/unit/ptimer-test.c
+++ b/tests/unit/ptimer-test.c
@ -12,7 +12,7 @@
 #include <glib/gprintf.h>

 #include "qemu/main-loop.h"
-#include "hw/ptimer.h"
+#include "hw/core/ptimer.h"

 #include "ptimer-test.h"