jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory

Move RTC devices under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Message-Id: <20191003230404.19384-7-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>

authored by

Philippe Mathieu-Daudé and committed by
Laurent Vivier 2811ac30 de04c31d

+31 -13
+2 -2
MAINTAINERS
··· 1163 1163 M: Artyom Tarasenko <atar4qemu@gmail.com> 1164 1164 S: Maintained 1165 1165 F: hw/sparc64/niagara.c 1166 - F: hw/timer/sun4v-rtc.c 1167 - F: include/hw/timer/sun4v-rtc.h 1166 + F: hw/rtc/sun4v-rtc.c 1167 + F: include/hw/rtc/sun4v-rtc.h 1168 1168 1169 1169 Leon3 1170 1170 M: Fabien Chouteau <chouteau@adacore.com>
+3
hw/rtc/Kconfig
··· 10 10 11 11 config MC146818RTC 12 12 bool 13 + 14 + config SUN4V_RTC 15 + bool
+1
hw/rtc/Makefile.objs
··· 5 5 endif 6 6 common-obj-$(CONFIG_PL031) += pl031.o 7 7 obj-$(CONFIG_MC146818RTC) += mc146818rtc.o 8 + common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
+4
hw/rtc/trace-events
··· 1 1 # See docs/devel/tracing.txt for syntax documentation. 2 2 3 + # sun4v-rtc.c 4 + sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64 5 + sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64 6 + 3 7 # pl031.c 4 8 pl031_irq_state(int level) "irq state %d" 5 9 pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
+1 -1
hw/sparc64/niagara.c
··· 30 30 #include "hw/misc/unimp.h" 31 31 #include "hw/loader.h" 32 32 #include "hw/sparc/sparc64.h" 33 - #include "hw/timer/sun4v-rtc.h" 33 + #include "hw/rtc/sun4v-rtc.h" 34 34 #include "exec/address-spaces.h" 35 35 #include "sysemu/block-backend.h" 36 36 #include "qemu/error-report.h"
-3
hw/timer/Kconfig
··· 35 35 config STM32F2XX_TIMER 36 36 bool 37 37 38 - config SUN4V_RTC 39 - bool 40 - 41 38 config CMSDK_APB_TIMER 42 39 bool 43 40 select PTIMER
-1
hw/timer/Makefile.objs
··· 35 35 common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o 36 36 common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o 37 37 38 - common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o 39 38 common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o 40 39 common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o 41 40 common-obj-$(CONFIG_MSF2) += mss-timer.o
+1 -1
hw/timer/sun4v-rtc.c hw/rtc/sun4v-rtc.c
··· 13 13 #include "hw/sysbus.h" 14 14 #include "qemu/module.h" 15 15 #include "qemu/timer.h" 16 - #include "hw/timer/sun4v-rtc.h" 16 + #include "hw/rtc/sun4v-rtc.h" 17 17 #include "trace.h" 18 18 19 19
-4
hw/timer/trace-events
··· 70 70 aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 71 71 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 72 72 73 - # sun4v-rtc.c 74 - sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64 75 - sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64 76 - 77 73 # xlnx-zynqmp-rtc.c 78 74 xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d" 79 75
+19
include/hw/rtc/sun4v-rtc.h
··· 1 + /* 2 + * QEMU sun4v Real Time Clock device 3 + * 4 + * The sun4v_rtc device (sun4v tod clock) 5 + * 6 + * Copyright (c) 2016 Artyom Tarasenko 7 + * 8 + * This code is licensed under the GNU GPL v3 or (at your option) any later 9 + * version. 10 + */ 11 + 12 + #ifndef HW_RTC_SUN4V 13 + #define HW_RTC_SUN4V 14 + 15 + #include "exec/hwaddr.h" 16 + 17 + void sun4v_rtc_init(hwaddr addr); 18 + 19 + #endif
-1
include/hw/timer/sun4v-rtc.h
··· 1 - void sun4v_rtc_init(hwaddr addr);