* [PULL 00/19] Trivial branch patches
@ 2019-10-25 8:34 Laurent Vivier
2019-10-25 8:34 ` [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter Laurent Vivier
` (19 more replies)
0 siblings, 20 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Edgar E. Iglesias, qemu-block, qemu-trivial, Helge Deller,
Hervé Poussineau, Joel Stanley, David Gibson,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
for you to fetch changes up to fabb862f76f093cdd1610571de9ba714d3333c1c:
hw/rtc/aspeed_rtc: Remove unused includes (2019-10-24 20:35:28 +0200)
----------------------------------------------------------------
Fix typos and docs, trivial changes and RTC devices split
----------------------------------------------------------------
Frediano Ziglio (3):
util/async: avoid useless cast
event_notifier: avoid dandling file descriptor in
event_notifier_cleanup
qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms
Han Han (1):
qemu-options.hx: Update for reboot-timeout parameter
Mao Zhongyi (1):
pci_bridge: fix a typo in comment
Philippe Mathieu-Daudé (14):
hw/timer: Compile devices not target-dependent as common object
hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory
hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory
hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory
hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory
hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less
hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include
hw/rtc/aspeed_rtc: Remove unused includes
MAINTAINERS | 20 +++----
Makefile.objs | 1 +
hw/Kconfig | 1 +
hw/Makefile.objs | 1 +
hw/alpha/dp264.c | 2 +-
hw/arm/musca.c | 2 +-
hw/hppa/machine.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/pc.c | 2 +-
hw/i386/pc_q35.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/mips/mips_r4k.c | 2 +-
hw/pci/pci_bridge.c | 2 +-
hw/ppc/pnv.c | 2 +-
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/prep.c | 4 +-
hw/rtc/Kconfig | 23 ++++++++
hw/rtc/Makefile.objs | 13 +++++
hw/{timer => rtc}/aspeed_rtc.c | 2 +-
hw/{timer => rtc}/ds1338.c | 0
hw/{timer => rtc}/exynos4210_rtc.c | 0
hw/{timer => rtc}/m41t80.c | 0
hw/{timer => rtc}/m48t59-internal.h | 0
hw/{timer => rtc}/m48t59-isa.c | 4 +-
hw/{timer => rtc}/m48t59.c | 2 +-
hw/{timer => rtc}/mc146818rtc.c | 3 +-
hw/{timer => rtc}/pl031.c | 2 +-
hw/{timer => rtc}/sun4v-rtc.c | 2 +-
hw/rtc/trace-events | 19 +++++++
hw/{timer => rtc}/twl92230.c | 0
hw/{timer => rtc}/xlnx-zynqmp-rtc.c | 3 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/niagara.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
hw/timer/Kconfig | 24 ---------
hw/timer/Makefile.objs | 35 ++++--------
hw/timer/hpet.c | 3 +-
hw/timer/trace-events | 18 -------
include/hw/arm/aspeed_soc.h | 2 +-
include/hw/arm/xlnx-zynqmp.h | 2 +-
include/hw/{timer => rtc}/aspeed_rtc.h | 9 ++--
include/hw/rtc/m48t59.h | 57 ++++++++++++++++++++
include/hw/{timer => rtc}/mc146818rtc.h | 13 +++--
include/hw/{timer => rtc}/mc146818rtc_regs.h | 5 +-
include/hw/{timer => rtc}/pl031.h | 5 +-
include/hw/rtc/sun4v-rtc.h | 19 +++++++
include/hw/{timer => rtc}/xlnx-zynqmp-rtc.h | 6 +--
include/hw/timer/m48t59.h | 32 -----------
include/hw/timer/sun4v-rtc.h | 1 -
qemu-options.hx | 4 +-
tests/rtc-test.c | 2 +-
util/async.c | 1 -
util/event_notifier-posix.c | 2 +-
util/qemu-timer.c | 6 +--
56 files changed, 213 insertions(+), 165 deletions(-)
create mode 100644 hw/rtc/Kconfig
create mode 100644 hw/rtc/Makefile.objs
rename hw/{timer => rtc}/aspeed_rtc.c (99%)
rename hw/{timer => rtc}/ds1338.c (100%)
rename hw/{timer => rtc}/exynos4210_rtc.c (100%)
rename hw/{timer => rtc}/m41t80.c (100%)
rename hw/{timer => rtc}/m48t59-internal.h (100%)
rename hw/{timer => rtc}/m48t59-isa.c (98%)
rename hw/{timer => rtc}/m48t59.c (99%)
rename hw/{timer => rtc}/mc146818rtc.c (99%)
rename hw/{timer => rtc}/pl031.c (99%)
rename hw/{timer => rtc}/sun4v-rtc.c (98%)
create mode 100644 hw/rtc/trace-events
rename hw/{timer => rtc}/twl92230.c (100%)
rename hw/{timer => rtc}/xlnx-zynqmp-rtc.c (99%)
rename include/hw/{timer => rtc}/aspeed_rtc.h (80%)
create mode 100644 include/hw/rtc/m48t59.h
rename include/hw/{timer => rtc}/mc146818rtc.h (63%)
rename include/hw/{timer => rtc}/mc146818rtc_regs.h (96%)
rename include/hw/{timer => rtc}/pl031.h (93%)
create mode 100644 include/hw/rtc/sun4v-rtc.h
rename include/hw/{timer => rtc}/xlnx-zynqmp-rtc.h (95%)
delete mode 100644 include/hw/timer/m48t59.h
delete mode 100644 include/hw/timer/sun4v-rtc.h
--
2.21.0
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:34 ` [PULL 02/19] pci_bridge: fix a typo in comment Laurent Vivier
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Han Han, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Markus Armbruster, Hervé Poussineau,
Joel Stanley, David Gibson, Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Han Han <hhan@redhat.com>
Since ee5d0f89d, -1 is not valid for the value of reboot-timeout. Update
that in qemu-options doc.
Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191015151451.727323-1-hhan@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
qemu-options.hx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 996b6fba7461..88b05599b1cd 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -327,8 +327,8 @@ format(true color). The resolution should be supported by the SVGA mode, so
the recommended is 320x240, 640x480, 800x640.
A timeout could be passed to bios, guest will pause for @var{rb_timeout} ms
-when boot failed, then reboot. If @var{rb_timeout} is '-1', guest will not
-reboot, qemu passes '-1' to bios by default. Currently Seabios for X86
+when boot failed, then reboot. If @option{reboot-timeout} is not set,
+guest will not reboot by default. Currently Seabios for X86
system support it.
Do strict boot via @option{strict=on} as far as firmware/BIOS
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 02/19] pci_bridge: fix a typo in comment
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
2019-10-25 8:34 ` [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:34 ` [PULL 03/19] util/async: avoid useless cast Laurent Vivier
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Edgar E. Iglesias, qemu-block, qemu-trivial, Helge Deller,
Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mao Zhongyi, Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190909031446.1331810-1-maozhongyi@cmss.chinamobile.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/pci/pci_bridge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 715b9a4fe616..97967d12eb45 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -311,7 +311,7 @@ void pci_bridge_reset(DeviceState *qdev)
/*
* the default values for base/limit registers aren't specified
- * in the PCI-to-PCI-bridge spec. So we don't thouch them here.
+ * in the PCI-to-PCI-bridge spec. So we don't touch them here.
* Each implementation can override it.
* typical implementation does
* zero base/limit registers or
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 03/19] util/async: avoid useless cast
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
2019-10-25 8:34 ` [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter Laurent Vivier
2019-10-25 8:34 ` [PULL 02/19] pci_bridge: fix a typo in comment Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:34 ` [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup Laurent Vivier
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Edgar E. Iglesias, qemu-block, qemu-trivial, Helge Deller,
Hervé Poussineau, Joel Stanley, David Gibson,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno, Frediano Ziglio
From: Frediano Ziglio <fziglio@redhat.com>
event_notifier_dummy_cb is already compatible with EventNotifierHandler.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191023122652.2999-1-fziglio@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
util/async.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/util/async.c b/util/async.c
index ca83e32c7fa1..b1fa5319e5bc 100644
--- a/util/async.c
+++ b/util/async.c
@@ -429,7 +429,6 @@ AioContext *aio_context_new(Error **errp)
aio_set_event_notifier(ctx, &ctx->notifier,
false,
- (EventNotifierHandler *)
event_notifier_dummy_cb,
event_notifier_poll);
#ifdef CONFIG_LINUX_AIO
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (2 preceding siblings ...)
2019-10-25 8:34 ` [PULL 03/19] util/async: avoid useless cast Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:34 ` [PULL 05/19] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms Laurent Vivier
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Edgar E. Iglesias, qemu-block, qemu-trivial, Helge Deller,
Hervé Poussineau, Joel Stanley, David Gibson,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno, Frediano Ziglio
From: Frediano Ziglio <fziglio@redhat.com>
If rfd is equal to wfd the file descriptor is closed but
rfd will still have the closed value.
The EventNotifier structure should not be used again after calling
event_notifier_cleanup or should be initialized again but make
sure to not have dandling file descriptors around.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191023122652.2999-2-fziglio@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
util/event_notifier-posix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 73c4046b5871..00d93204f988 100644
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -80,8 +80,8 @@ void event_notifier_cleanup(EventNotifier *e)
{
if (e->rfd != e->wfd) {
close(e->rfd);
- e->rfd = -1;
}
+ e->rfd = -1;
close(e->wfd);
e->wfd = -1;
}
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 05/19] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (3 preceding siblings ...)
2019-10-25 8:34 ` [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:34 ` [PULL 06/19] hw/timer: Compile devices not target-dependent as common object Laurent Vivier
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Edgar E. Iglesias, qemu-block, qemu-trivial, Helge Deller,
Hervé Poussineau, Joel Stanley, David Gibson,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno, Frediano Ziglio
From: Frediano Ziglio <fziglio@redhat.com>
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191023122652.2999-3-fziglio@redhat.com>
[lv: removed the two useless casts]
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
util/qemu-timer.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index d428fec56772..ef52d28d3753 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -322,11 +322,7 @@ int qemu_timeout_ns_to_ms(int64_t ns)
ms = DIV_ROUND_UP(ns, SCALE_MS);
/* To avoid overflow problems, limit this to 2^31, i.e. approx 25 days */
- if (ms > (int64_t) INT32_MAX) {
- ms = INT32_MAX;
- }
-
- return (int) ms;
+ return MIN(ms, INT32_MAX);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 06/19] hw/timer: Compile devices not target-dependent as common object
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (4 preceding siblings ...)
2019-10-25 8:34 ` [PULL 05/19] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:34 ` [PULL 07/19] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory Laurent Vivier
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
All these devices do not contain any target-specific. While most
of them are arch-specific, they are shared between different
targets of the same arch family (ARM and AArch64, MIPS32/MIPS64,
endianess, ...).
Put them into common-obj-y to compile them once for all targets.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191003230404.19384-2-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/timer/Makefile.objs | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 123d92c9692c..f407523aa49d 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -25,20 +25,20 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o
-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o
-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
-obj-$(CONFIG_OMAP) += omap_gptimer.o
-obj-$(CONFIG_OMAP) += omap_synctimer.o
-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o
-obj-$(CONFIG_SH4) += sh_timer.o
-obj-$(CONFIG_DIGIC) += digic-timer.o
-obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o
+common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
+common-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o
+common-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
+common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
+common-obj-$(CONFIG_OMAP) += omap_gptimer.o
+common-obj-$(CONFIG_OMAP) += omap_synctimer.o
+common-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o
+common-obj-$(CONFIG_SH4) += sh_timer.o
+common-obj-$(CONFIG_DIGIC) += digic-timer.o
+common-obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
+common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 07/19] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (5 preceding siblings ...)
2019-10-25 8:34 ` [PULL 06/19] hw/timer: Compile devices not target-dependent as common object Laurent Vivier
@ 2019-10-25 8:34 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 08/19] hw: Move MC146818 " Laurent Vivier
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:34 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The PL031 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 4 ++--
Makefile.objs | 1 +
hw/Kconfig | 1 +
hw/Makefile.objs | 1 +
hw/arm/musca.c | 2 +-
hw/rtc/Kconfig | 2 ++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/pl031.c | 2 +-
hw/rtc/trace-events | 8 ++++++++
hw/timer/Kconfig | 3 ---
hw/timer/Makefile.objs | 1 -
hw/timer/trace-events | 7 -------
include/hw/{timer => rtc}/pl031.h | 5 +++--
13 files changed, 21 insertions(+), 17 deletions(-)
create mode 100644 hw/rtc/Kconfig
create mode 100644 hw/rtc/Makefile.objs
rename hw/{timer => rtc}/pl031.c (99%)
create mode 100644 hw/rtc/trace-events
rename include/hw/{timer => rtc}/pl031.h (93%)
diff --git a/MAINTAINERS b/MAINTAINERS
index ed41d7d1b6cc..2e13ba46282d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -495,8 +495,8 @@ F: hw/intc/pl190.c
F: hw/sd/pl181.c
F: hw/ssi/pl022.c
F: include/hw/ssi/pl022.h
-F: hw/timer/pl031.c
-F: include/hw/timer/pl031.h
+F: hw/rtc/pl031.c
+F: include/hw/rtc/pl031.h
F: include/hw/arm/primecell.h
F: hw/timer/cmsdk-apb-timer.c
F: include/hw/timer/cmsdk-apb-timer.h
diff --git a/Makefile.objs b/Makefile.objs
index abcbd89654ac..11ba1a36bd39 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -173,6 +173,7 @@ trace-events-subdirs += hw/pci-host
trace-events-subdirs += hw/ppc
trace-events-subdirs += hw/rdma
trace-events-subdirs += hw/rdma/vmw
+trace-events-subdirs += hw/rtc
trace-events-subdirs += hw/s390x
trace-events-subdirs += hw/scsi
trace-events-subdirs += hw/sd
diff --git a/hw/Kconfig b/hw/Kconfig
index b45db3c813ff..4b53fee4d0ce 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -27,6 +27,7 @@ source pci-host/Kconfig
source pcmcia/Kconfig
source pci/Kconfig
source rdma/Kconfig
+source rtc/Kconfig
source scsi/Kconfig
source sd/Kconfig
source semihosting/Kconfig
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index ece6cc37550f..fd9750e5f273 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -26,6 +26,7 @@ devices-dirs-y += nvram/
devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
+devices-dirs-y += rtc/
devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
devices-dirs-y += ssi/
diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index 68db4b5b3878..ba99dd19413d 100644
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -32,7 +32,7 @@
#include "hw/misc/tz-mpc.h"
#include "hw/misc/tz-ppc.h"
#include "hw/misc/unimp.h"
-#include "hw/timer/pl031.h"
+#include "hw/rtc/pl031.h"
#define MUSCA_NUMIRQ_MAX 96
#define MUSCA_PPC_MAX 3
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
new file mode 100644
index 000000000000..8a4383bca9b2
--- /dev/null
+++ b/hw/rtc/Kconfig
@@ -0,0 +1,2 @@
+config PL031
+ bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
new file mode 100644
index 000000000000..3e1eb4256388
--- /dev/null
+++ b/hw/rtc/Makefile.objs
@@ -0,0 +1 @@
+common-obj-$(CONFIG_PL031) += pl031.o
diff --git a/hw/timer/pl031.c b/hw/rtc/pl031.c
similarity index 99%
rename from hw/timer/pl031.c
rename to hw/rtc/pl031.c
index 2b3e26100699..3a982752a2ad 100644
--- a/hw/timer/pl031.c
+++ b/hw/rtc/pl031.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/timer/pl031.h"
+#include "hw/rtc/pl031.h"
#include "migration/vmstate.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events
new file mode 100644
index 000000000000..54c94ac557b2
--- /dev/null
+++ b/hw/rtc/trace-events
@@ -0,0 +1,8 @@
+# See docs/devel/tracing.txt for syntax documentation.
+
+# pl031.c
+pl031_irq_state(int level) "irq state %d"
+pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
+pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
+pl031_alarm_raised(void) "alarm raised"
+pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index eefc95f35ecc..27c5dce09e43 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -27,9 +27,6 @@ config M41T80
config M48T59
bool
-config PL031
- bool
-
config TWL92230
bool
depends on I2C
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index f407523aa49d..9f64f6e11e78 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -11,7 +11,6 @@ common-obj-$(CONFIG_M48T59) += m48t59.o
ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif
-common-obj-$(CONFIG_PL031) += pl031.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index db02a9142cda..6936fe8573e9 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -80,10 +80,3 @@ xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec
# nrf51_timer.c
nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
-
-# pl031.c
-pl031_irq_state(int level) "irq state %d"
-pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
-pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
-pl031_alarm_raised(void) "alarm raised"
-pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
diff --git a/include/hw/timer/pl031.h b/include/hw/rtc/pl031.h
similarity index 93%
rename from include/hw/timer/pl031.h
rename to include/hw/rtc/pl031.h
index 8c3f555ee288..e3cb1d646fc4 100644
--- a/include/hw/timer/pl031.h
+++ b/include/hw/rtc/pl031.h
@@ -11,10 +11,11 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#ifndef HW_TIMER_PL031_H
-#define HW_TIMER_PL031_H
+#ifndef HW_RTC_PL031_H
+#define HW_RTC_PL031_H
#include "hw/sysbus.h"
+#include "qemu/timer.h"
#define TYPE_PL031 "pl031"
#define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031)
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 08/19] hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (6 preceding siblings ...)
2019-10-25 8:34 ` [PULL 07/19] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 09/19] hw: Move M48T59 " Laurent Vivier
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The MC146818 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Use copyright statement from 80cabfad163 for "hw/rtc/mc146818rtc.h".
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191003230404.19384-4-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 4 ++--
hw/alpha/dp264.c | 2 +-
hw/hppa/machine.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/pc.c | 2 +-
hw/i386/pc_q35.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/mips/mips_r4k.c | 2 +-
hw/ppc/pnv.c | 2 +-
hw/ppc/prep.c | 2 +-
hw/rtc/Kconfig | 3 +++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/mc146818rtc.c | 2 +-
hw/timer/Kconfig | 3 ---
hw/timer/Makefile.objs | 2 --
hw/timer/hpet.c | 2 +-
include/hw/{timer => rtc}/mc146818rtc.h | 14 +++++++++++---
include/hw/{timer => rtc}/mc146818rtc_regs.h | 5 +++--
tests/rtc-test.c | 2 +-
21 files changed, 34 insertions(+), 26 deletions(-)
rename hw/{timer => rtc}/mc146818rtc.c (99%)
rename include/hw/{timer => rtc}/mc146818rtc.h (58%)
rename include/hw/{timer => rtc}/mc146818rtc_regs.h (96%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2e13ba46282d..7eba146444ae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1261,7 +1261,7 @@ F: hw/misc/debugexit.c
F: hw/misc/pc-testdev.c
F: hw/timer/hpet*
F: hw/timer/i8254*
-F: hw/timer/mc146818rtc*
+F: hw/rtc/mc146818rtc*
F: hw/watchdog/wdt_ib700.c
F: hw/watchdog/wdt_i6300esb.c
F: include/hw/display/vga.h
@@ -1273,7 +1273,7 @@ F: include/hw/isa/i8259_internal.h
F: include/hw/isa/superio.h
F: include/hw/timer/hpet.h
F: include/hw/timer/i8254*
-F: include/hw/timer/mc146818rtc*
+F: include/hw/rtc/mc146818rtc*
Machine core
M: Eduardo Habkost <ehabkost@redhat.com>
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 51feee855812..51b3cf7a6128 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -14,7 +14,7 @@
#include "alpha_sys.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/ide.h"
#include "hw/timer/i8254.h"
#include "hw/isa/superio.h"
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 953d454f4879..b30aba6d5439 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -12,7 +12,7 @@
#include "qemu/error-report.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/ide.h"
#include "hw/timer/i8254.h"
#include "hw/char/serial.h"
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1d077a7cb772..d9435ba0b310 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -45,7 +45,7 @@
#include "hw/acpi/vmgenid.h"
#include "hw/boards.h"
#include "sysemu/tpm_backend.h"
-#include "hw/timer/mc146818rtc_regs.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/mem/memory-device.h"
#include "sysemu/numa.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 4b1904237ec6..51b72439b440 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -42,7 +42,7 @@
#include "elf.h"
#include "migration/vmstate.h"
#include "multiboot.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/dma/i8257.h"
#include "hw/timer/i8254.h"
#include "hw/input/i8042.h"
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 8fad20f3146a..748fc2ee15bf 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "sysemu/arch_init.h"
#include "hw/i2c/smbus_eeprom.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/xen/xen.h"
#include "sysemu/kvm.h"
#include "kvm_i386.h"
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index cf537dd7e631..03a27e176796 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -39,7 +39,7 @@
#include "hw/ide.h"
#include "elf.h"
#include "hw/isa/vt82c686.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 8d010a0b6e10..d978bb64a0f5 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -39,7 +39,7 @@
#include "hw/scsi/esp.h"
#include "hw/mips/bios.h"
#include "hw/loader.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "hw/display/vga.h"
#include "hw/audio/pcspk.h"
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 4d9c64b36ab2..c1c8810e7198 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -45,7 +45,7 @@
#include "hw/irq.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "exec/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index bc0be2654415..70024235ae52 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -28,7 +28,7 @@
#include "hw/ide.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/input/i8042.h"
#include "hw/timer/i8254.h"
#include "exec/address-spaces.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 4a51fb65a834..60632720ef6f 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -48,7 +48,7 @@
#include "hw/isa/isa.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include <libfdt.h>
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 4f3c6bf19018..3a51536e1a39 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -40,7 +40,7 @@
#include "hw/ide.h"
#include "hw/irq.h"
#include "hw/loader.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "hw/isa/pc87312.h"
#include "hw/net/ne2000-isa.h"
#include "sysemu/arch_init.h"
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index 8a4383bca9b2..7ffd702268ad 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -1,2 +1,5 @@
config PL031
bool
+
+config MC146818RTC
+ bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 3e1eb4256388..3cac0d5a637b 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -1 +1,2 @@
common-obj-$(CONFIG_PL031) += pl031.o
+obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
diff --git a/hw/timer/mc146818rtc.c b/hw/rtc/mc146818rtc.c
similarity index 99%
rename from hw/timer/mc146818rtc.c
rename to hw/rtc/mc146818rtc.c
index 6cb378751b1f..ced15f764fc1 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -34,7 +34,7 @@
#include "sysemu/replay.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h"
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 27c5dce09e43..af415c8ef831 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -35,9 +35,6 @@ config ALTERA_TIMER
bool
select PTIMER
-config MC146818RTC
- bool
-
config ALLWINNER_A10_PIT
bool
select PTIMER
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 9f64f6e11e78..b0159189cf34 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -35,8 +35,6 @@ common-obj-$(CONFIG_SH4) += sh_timer.o
common-obj-$(CONFIG_DIGIC) += digic-timer.o
common-obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o
-obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
-
common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 1ddae4e7d7dc..02bf8a8ce8fc 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -33,7 +33,7 @@
#include "qemu/timer.h"
#include "hw/timer/hpet.h"
#include "hw/sysbus.h"
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
similarity index 58%
rename from include/hw/timer/mc146818rtc.h
rename to include/hw/rtc/mc146818rtc.h
index fe6ed63f7179..2e9331637a6d 100644
--- a/include/hw/timer/mc146818rtc.h
+++ b/include/hw/rtc/mc146818rtc.h
@@ -1,8 +1,16 @@
-#ifndef MC146818RTC_H
-#define MC146818RTC_H
+/*
+ * QEMU MC146818 RTC emulation
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef HW_RTC_MC146818RTC_H
+#define HW_RTC_MC146818RTC_H
#include "hw/isa/isa.h"
-#include "hw/timer/mc146818rtc_regs.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#define TYPE_MC146818_RTC "mc146818rtc"
diff --git a/include/hw/timer/mc146818rtc_regs.h b/include/hw/rtc/mc146818rtc_regs.h
similarity index 96%
rename from include/hw/timer/mc146818rtc_regs.h
rename to include/hw/rtc/mc146818rtc_regs.h
index bfbb57e57012..dd6c09e2fcf9 100644
--- a/include/hw/timer/mc146818rtc_regs.h
+++ b/include/hw/rtc/mc146818rtc_regs.h
@@ -22,10 +22,11 @@
* THE SOFTWARE.
*/
-#ifndef MC146818RTC_REGS_H
-#define MC146818RTC_REGS_H
+#ifndef HW_RTC_MC146818RTC_REGS_H
+#define HW_RTC_MC146818RTC_REGS_H
#include "qemu/timer.h"
+#include "qemu/host-utils.h"
#define RTC_ISA_IRQ 8
diff --git a/tests/rtc-test.c b/tests/rtc-test.c
index 6309b0ef6cc2..79a4ff1ed611 100644
--- a/tests/rtc-test.c
+++ b/tests/rtc-test.c
@@ -15,7 +15,7 @@
#include "libqtest-single.h"
#include "qemu/timer.h"
-#include "hw/timer/mc146818rtc_regs.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#define UIP_HOLD_LENGTH (8 * NANOSECONDS_PER_SECOND / 32768)
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 09/19] hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (7 preceding siblings ...)
2019-10-25 8:35 ` [PULL 08/19] hw: Move MC146818 " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 10/19] hw: Move M41T80 " Laurent Vivier
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The M48T59 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191003230404.19384-5-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 4 +-
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/prep.c | 2 +-
hw/rtc/Kconfig | 3 ++
hw/rtc/Makefile.objs | 4 ++
hw/{timer => rtc}/m48t59-internal.h | 0
hw/{timer => rtc}/m48t59-isa.c | 4 +-
hw/{timer => rtc}/m48t59.c | 2 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
hw/timer/Kconfig | 3 --
hw/timer/Makefile.objs | 4 --
include/hw/rtc/m48t59.h | 57 +++++++++++++++++++++++++++++
include/hw/timer/m48t59.h | 32 ----------------
14 files changed, 73 insertions(+), 48 deletions(-)
rename hw/{timer => rtc}/m48t59-internal.h (100%)
rename hw/{timer => rtc}/m48t59-isa.c (98%)
rename hw/{timer => rtc}/m48t59.c (99%)
create mode 100644 include/hw/rtc/m48t59.h
delete mode 100644 include/hw/timer/m48t59.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 7eba146444ae..4e65f062f29c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1064,9 +1064,9 @@ F: hw/pci-host/prep.[hc]
F: hw/isa/i82378.c
F: hw/isa/pc87312.c
F: hw/dma/i82374.c
-F: hw/timer/m48t59-isa.c
+F: hw/rtc/m48t59-isa.c
F: include/hw/isa/pc87312.h
-F: include/hw/timer/m48t59.h
+F: include/hw/rtc/m48t59.h
F: pc-bios/ppc_rom.bin
sPAPR
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 388cae0b4370..1f721feed6a4 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -29,7 +29,7 @@
#include "cpu.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
-#include "hw/timer/m48t59.h"
+#include "hw/rtc/m48t59.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "sysemu/qtest.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 3a51536e1a39..862345c2ac5f 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hw/timer/m48t59.h"
+#include "hw/rtc/m48t59.h"
#include "hw/char/serial.h"
#include "hw/block/fdc.h"
#include "net/net.h"
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index 7ffd702268ad..159c2335171a 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -1,3 +1,6 @@
+config M48T59
+ bool
+
config PL031
bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 3cac0d5a637b..c87f81405e9d 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -1,2 +1,6 @@
+common-obj-$(CONFIG_M48T59) += m48t59.o
+ifeq ($(CONFIG_ISA_BUS),y)
+common-obj-$(CONFIG_M48T59) += m48t59-isa.o
+endif
common-obj-$(CONFIG_PL031) += pl031.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
diff --git a/hw/timer/m48t59-internal.h b/hw/rtc/m48t59-internal.h
similarity index 100%
rename from hw/timer/m48t59-internal.h
rename to hw/rtc/m48t59-internal.h
diff --git a/hw/timer/m48t59-isa.c b/hw/rtc/m48t59-isa.c
similarity index 98%
rename from hw/timer/m48t59-isa.c
rename to hw/rtc/m48t59-isa.c
index 5e5432abfdfa..7fde854c0f8f 100644
--- a/hw/timer/m48t59-isa.c
+++ b/hw/rtc/m48t59-isa.c
@@ -1,5 +1,5 @@
/*
- * QEMU M48T59 and M48T08 NVRAM emulation (ISA bus interface
+ * QEMU M48T59 and M48T08 NVRAM emulation (ISA bus interface)
*
* Copyright (c) 2003-2005, 2007 Jocelyn Mayer
* Copyright (c) 2013 Hervé Poussineau
@@ -26,7 +26,7 @@
#include "qemu/osdep.h"
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
-#include "hw/timer/m48t59.h"
+#include "hw/rtc/m48t59.h"
#include "m48t59-internal.h"
#include "qemu/module.h"
diff --git a/hw/timer/m48t59.c b/hw/rtc/m48t59.c
similarity index 99%
rename from hw/timer/m48t59.c
rename to hw/rtc/m48t59.c
index a9fc2f981a56..fc592b9fb126 100644
--- a/hw/timer/m48t59.c
+++ b/hw/rtc/m48t59.c
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
-#include "hw/timer/m48t59.h"
+#include "hw/rtc/m48t59.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 6c5a17a02055..2aaa5bf1ae2e 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -31,7 +31,7 @@
#include "qemu/error-report.h"
#include "qemu/timer.h"
#include "hw/sparc/sun4m_iommu.h"
-#include "hw/timer/m48t59.h"
+#include "hw/rtc/m48t59.h"
#include "migration/vmstate.h"
#include "hw/sparc/sparc32_dma.h"
#include "hw/block/fdc.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 1ded2a4c9ab3..955082773b06 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -36,7 +36,7 @@
#include "hw/pci-host/sabre.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
-#include "hw/timer/m48t59.h"
+#include "hw/rtc/m48t59.h"
#include "migration/vmstate.h"
#include "hw/input/i8042.h"
#include "hw/block/fdc.h"
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index af415c8ef831..a57e9b59fca8 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -24,9 +24,6 @@ config M41T80
bool
depends on I2C
-config M48T59
- bool
-
config TWL92230
bool
depends on I2C
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index b0159189cf34..fe2d1fbc4040 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -7,10 +7,6 @@ common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
common-obj-$(CONFIG_M41T80) += m41t80.o
-common-obj-$(CONFIG_M48T59) += m48t59.o
-ifeq ($(CONFIG_ISA_BUS),y)
-common-obj-$(CONFIG_M48T59) += m48t59-isa.o
-endif
common-obj-$(CONFIG_PUV3) += puv3_ost.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h
new file mode 100644
index 000000000000..e7ea4e8761b9
--- /dev/null
+++ b/include/hw/rtc/m48t59.h
@@ -0,0 +1,57 @@
+/*
+ * QEMU M48T59 and M48T08 NVRAM emulation
+ *
+ * Copyright (c) 2003-2005, 2007 Jocelyn Mayer
+ * Copyright (c) 2013 Hervé Poussineau
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef HW_RTC_M48T59_H
+#define HW_RTC_M48T59_H
+
+#include "exec/hwaddr.h"
+#include "qom/object.h"
+
+#define TYPE_NVRAM "nvram"
+
+#define NVRAM_CLASS(klass) \
+ OBJECT_CLASS_CHECK(NvramClass, (klass), TYPE_NVRAM)
+#define NVRAM_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(NvramClass, (obj), TYPE_NVRAM)
+#define NVRAM(obj) \
+ INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM)
+
+typedef struct Nvram Nvram;
+
+typedef struct NvramClass {
+ InterfaceClass parent;
+
+ uint32_t (*read)(Nvram *obj, uint32_t addr);
+ void (*write)(Nvram *obj, uint32_t addr, uint32_t val);
+ void (*toggle_lock)(Nvram *obj, int lock);
+} NvramClass;
+
+Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
+ int base_year, int type);
+Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
+ uint32_t io_base, uint16_t size, int base_year,
+ int type);
+
+#endif /* HW_M48T59_H */
diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h
deleted file mode 100644
index f74854c0260b..000000000000
--- a/include/hw/timer/m48t59.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef HW_M48T59_H
-#define HW_M48T59_H
-
-#include "exec/hwaddr.h"
-#include "qom/object.h"
-
-#define TYPE_NVRAM "nvram"
-
-#define NVRAM_CLASS(klass) \
- OBJECT_CLASS_CHECK(NvramClass, (klass), TYPE_NVRAM)
-#define NVRAM_GET_CLASS(obj) \
- OBJECT_GET_CLASS(NvramClass, (obj), TYPE_NVRAM)
-#define NVRAM(obj) \
- INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM)
-
-typedef struct Nvram Nvram;
-
-typedef struct NvramClass {
- InterfaceClass parent;
-
- uint32_t (*read)(Nvram *obj, uint32_t addr);
- void (*write)(Nvram *obj, uint32_t addr, uint32_t val);
- void (*toggle_lock)(Nvram *obj, int lock);
-} NvramClass;
-
-Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
- int base_year, int type);
-Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
- uint32_t io_base, uint16_t size, int base_year,
- int type);
-
-#endif /* HW_M48T59_H */
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 10/19] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (8 preceding siblings ...)
2019-10-25 8:35 ` [PULL 09/19] hw: Move M48T59 " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 11/19] hw: Move sun4v hypervisor RTC " Laurent Vivier
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The M41T80 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191003230404.19384-6-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 2 +-
hw/rtc/Kconfig | 4 ++++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/m41t80.c | 0
hw/timer/Kconfig | 4 ----
hw/timer/Makefile.objs | 1 -
6 files changed, 6 insertions(+), 6 deletions(-)
rename hw/{timer => rtc}/m41t80.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e65f062f29c..ba0d1906aae9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1111,7 +1111,7 @@ F: hw/ppc/sam460ex.c
F: hw/ppc/ppc440_pcix.c
F: hw/display/sm501*
F: hw/ide/sii3112.c
-F: hw/timer/m41t80.c
+F: hw/rtc/m41t80.c
F: pc-bios/canyonlands.dt[sb]
F: pc-bios/u-boot-sam460ex-20100605.bin
F: roms/u-boot-sam460ex
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index 159c2335171a..434b20b2b1bd 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -1,3 +1,7 @@
+config M41T80
+ bool
+ depends on I2C
+
config M48T59
bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index c87f81405e9d..89e8e48c6409 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -1,3 +1,4 @@
+common-obj-$(CONFIG_M41T80) += m41t80.o
common-obj-$(CONFIG_M48T59) += m48t59.o
ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
diff --git a/hw/timer/m41t80.c b/hw/rtc/m41t80.c
similarity index 100%
rename from hw/timer/m41t80.c
rename to hw/rtc/m41t80.c
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index a57e9b59fca8..a6b668b2559b 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -20,10 +20,6 @@ config HPET
config I8254
bool
-config M41T80
- bool
- depends on I2C
-
config TWL92230
bool
depends on I2C
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index fe2d1fbc4040..2fb12162a623 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -6,7 +6,6 @@ common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
-common-obj-$(CONFIG_M41T80) += m41t80.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 11/19] hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (9 preceding siblings ...)
2019-10-25 8:35 ` [PULL 10/19] hw: Move M41T80 " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 12/19] hw: Move TWL92230 device " Laurent Vivier
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
---
MAINTAINERS | 4 ++--
hw/rtc/Kconfig | 3 +++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/sun4v-rtc.c | 2 +-
hw/rtc/trace-events | 4 ++++
hw/sparc64/niagara.c | 2 +-
hw/timer/Kconfig | 3 ---
hw/timer/Makefile.objs | 1 -
hw/timer/trace-events | 4 ----
include/hw/rtc/sun4v-rtc.h | 19 +++++++++++++++++++
include/hw/timer/sun4v-rtc.h | 1 -
11 files changed, 31 insertions(+), 13 deletions(-)
rename hw/{timer => rtc}/sun4v-rtc.c (98%)
create mode 100644 include/hw/rtc/sun4v-rtc.h
delete mode 100644 include/hw/timer/sun4v-rtc.h
diff --git a/MAINTAINERS b/MAINTAINERS
index ba0d1906aae9..a7de5e2d1253 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1163,8 +1163,8 @@ Sun4v
M: Artyom Tarasenko <atar4qemu@gmail.com>
S: Maintained
F: hw/sparc64/niagara.c
-F: hw/timer/sun4v-rtc.c
-F: include/hw/timer/sun4v-rtc.h
+F: hw/rtc/sun4v-rtc.c
+F: include/hw/rtc/sun4v-rtc.h
Leon3
M: Fabien Chouteau <chouteau@adacore.com>
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index 434b20b2b1bd..cc7fead764f4 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -10,3 +10,6 @@ config PL031
config MC146818RTC
bool
+
+config SUN4V_RTC
+ bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 89e8e48c6409..4621b37bc2f6 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -5,3 +5,4 @@ common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif
common-obj-$(CONFIG_PL031) += pl031.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
+common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
diff --git a/hw/timer/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c
similarity index 98%
rename from hw/timer/sun4v-rtc.c
rename to hw/rtc/sun4v-rtc.c
index 54272a822fdf..ada01b57748b 100644
--- a/hw/timer/sun4v-rtc.c
+++ b/hw/rtc/sun4v-rtc.c
@@ -13,7 +13,7 @@
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "qemu/timer.h"
-#include "hw/timer/sun4v-rtc.h"
+#include "hw/rtc/sun4v-rtc.h"
#include "trace.h"
diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events
index 54c94ac557b2..ac9e0e0fba32 100644
--- a/hw/rtc/trace-events
+++ b/hw/rtc/trace-events
@@ -1,5 +1,9 @@
# See docs/devel/tracing.txt for syntax documentation.
+# sun4v-rtc.c
+sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64
+sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64
+
# pl031.c
pl031_irq_state(int level) "irq state %d"
pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 5987693659ed..5eb2d097b904 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -30,7 +30,7 @@
#include "hw/misc/unimp.h"
#include "hw/loader.h"
#include "hw/sparc/sparc64.h"
-#include "hw/timer/sun4v-rtc.h"
+#include "hw/rtc/sun4v-rtc.h"
#include "exec/address-spaces.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index a6b668b2559b..b04c928136c2 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -35,9 +35,6 @@ config ALLWINNER_A10_PIT
config STM32F2XX_TIMER
bool
-config SUN4V_RTC
- bool
-
config CMSDK_APB_TIMER
bool
select PTIMER
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 2fb12162a623..034bd30255c0 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -35,7 +35,6 @@ common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o
-common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o
common-obj-$(CONFIG_MSF2) += mss-timer.o
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index 6936fe8573e9..ce34b967db9f 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -70,10 +70,6 @@ cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset"
aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
-# sun4v-rtc.c
-sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64
-sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64
-
# xlnx-zynqmp-rtc.c
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"
diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h
new file mode 100644
index 000000000000..fd868f6ed2fa
--- /dev/null
+++ b/include/hw/rtc/sun4v-rtc.h
@@ -0,0 +1,19 @@
+/*
+ * QEMU sun4v Real Time Clock device
+ *
+ * The sun4v_rtc device (sun4v tod clock)
+ *
+ * Copyright (c) 2016 Artyom Tarasenko
+ *
+ * This code is licensed under the GNU GPL v3 or (at your option) any later
+ * version.
+ */
+
+#ifndef HW_RTC_SUN4V
+#define HW_RTC_SUN4V
+
+#include "exec/hwaddr.h"
+
+void sun4v_rtc_init(hwaddr addr);
+
+#endif
diff --git a/include/hw/timer/sun4v-rtc.h b/include/hw/timer/sun4v-rtc.h
deleted file mode 100644
index 407278f91831..000000000000
--- a/include/hw/timer/sun4v-rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-void sun4v_rtc_init(hwaddr addr);
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 12/19] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (10 preceding siblings ...)
2019-10-25 8:35 ` [PULL 11/19] hw: Move sun4v hypervisor RTC " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 13/19] hw: Move DS1338 " Laurent Vivier
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The TWL92230 is an "energy management device" companion with
a RTC. Since we mostly model the RTC, move it under the hw/rtc/
subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-8-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 2 +-
hw/rtc/Kconfig | 4 ++++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/twl92230.c | 0
hw/timer/Kconfig | 4 ----
hw/timer/Makefile.objs | 1 -
6 files changed, 6 insertions(+), 6 deletions(-)
rename hw/{timer => rtc}/twl92230.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index a7de5e2d1253..0dc72d37bdc8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -663,7 +663,7 @@ F: hw/display/blizzard.c
F: hw/input/lm832x.c
F: hw/input/tsc2005.c
F: hw/misc/cbus.c
-F: hw/timer/twl92230.c
+F: hw/rtc/twl92230.c
F: include/hw/display/blizzard.h
F: include/hw/input/tsc2xxx.h
F: include/hw/misc/cbus.h
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index cc7fead764f4..dff9d60946af 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -8,6 +8,10 @@ config M48T59
config PL031
bool
+config TWL92230
+ bool
+ depends on I2C
+
config MC146818RTC
bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 4621b37bc2f6..810a38ee7b3d 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -4,5 +4,6 @@ ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif
common-obj-$(CONFIG_PL031) += pl031.o
+common-obj-$(CONFIG_TWL92230) += twl92230.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
diff --git a/hw/timer/twl92230.c b/hw/rtc/twl92230.c
similarity index 100%
rename from hw/timer/twl92230.c
rename to hw/rtc/twl92230.c
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index b04c928136c2..9357875f285d 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -20,10 +20,6 @@ config HPET
config I8254
bool
-config TWL92230
- bool
- depends on I2C
-
config ALTERA_TIMER
bool
select PTIMER
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 034bd30255c0..23be70b71d32 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -7,7 +7,6 @@ common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
-common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
common-obj-$(CONFIG_SLAVIO) += slavio_timer.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_timer.o
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 13/19] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (11 preceding siblings ...)
2019-10-25 8:35 ` [PULL 12/19] hw: Move TWL92230 device " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 14/19] hw: Move Xilinx ZynqMP RTC " Laurent Vivier
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The DS1338 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-9-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/Kconfig | 4 ++++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/ds1338.c | 0
hw/timer/Kconfig | 4 ----
hw/timer/Makefile.objs | 1 -
5 files changed, 5 insertions(+), 5 deletions(-)
rename hw/{timer => rtc}/ds1338.c (100%)
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index dff9d60946af..45daa8d655c9 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -1,3 +1,7 @@
+config DS1338
+ bool
+ depends on I2C
+
config M41T80
bool
depends on I2C
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 810a38ee7b3d..b195863291d1 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -1,3 +1,4 @@
+common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_M41T80) += m41t80.o
common-obj-$(CONFIG_M48T59) += m48t59.o
ifeq ($(CONFIG_ISA_BUS),y)
diff --git a/hw/timer/ds1338.c b/hw/rtc/ds1338.c
similarity index 100%
rename from hw/timer/ds1338.c
rename to hw/rtc/ds1338.c
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 9357875f285d..a990f9fe35fc 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -9,10 +9,6 @@ config ARM_MPTIMER
config A9_GTIMER
bool
-config DS1338
- bool
- depends on I2C
-
config HPET
bool
default y if PC
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 23be70b71d32..70b61b69c7a4 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -3,7 +3,6 @@ common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o
common-obj-$(CONFIG_ARM_V7M) += armv7m_systick.o
common-obj-$(CONFIG_A9_GTIMER) += a9gtimer.o
common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
-common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 14/19] hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (12 preceding siblings ...)
2019-10-25 8:35 ` [PULL 13/19] hw: Move DS1338 " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 15/19] hw: Move Exynos4210 " Laurent Vivier
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Move RTC devices under the hw/rtc/ subdirectory.
Remove Alistair outdated email address (see commit c22e580c2ad).
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-10-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/Makefile.objs | 1 +
hw/rtc/trace-events | 3 +++
hw/{timer => rtc}/xlnx-zynqmp-rtc.c | 2 +-
hw/timer/Makefile.objs | 1 -
hw/timer/trace-events | 3 ---
include/hw/arm/xlnx-zynqmp.h | 2 +-
include/hw/{timer => rtc}/xlnx-zynqmp-rtc.h | 6 +++---
7 files changed, 9 insertions(+), 9 deletions(-)
rename hw/{timer => rtc}/xlnx-zynqmp-rtc.c (99%)
rename include/hw/{timer => rtc}/xlnx-zynqmp-rtc.h (95%)
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index b195863291d1..543a550a0f11 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -6,5 +6,6 @@ common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif
common-obj-$(CONFIG_PL031) += pl031.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
+common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events
index ac9e0e0fba32..7f1945ad4cc6 100644
--- a/hw/rtc/trace-events
+++ b/hw/rtc/trace-events
@@ -4,6 +4,9 @@
sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64
sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64
+# xlnx-zynqmp-rtc.c
+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"
+
# pl031.c
pl031_irq_state(int level) "irq state %d"
pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c
similarity index 99%
rename from hw/timer/xlnx-zynqmp-rtc.c
rename to hw/rtc/xlnx-zynqmp-rtc.c
index 5692db98c2db..f9f09b72965a 100644
--- a/hw/timer/xlnx-zynqmp-rtc.c
+++ b/hw/rtc/xlnx-zynqmp-rtc.c
@@ -36,7 +36,7 @@
#include "qemu/cutils.h"
#include "sysemu/sysemu.h"
#include "trace.h"
-#include "hw/timer/xlnx-zynqmp-rtc.h"
+#include "hw/rtc/xlnx-zynqmp-rtc.h"
#include "migration/vmstate.h"
#ifndef XLNX_ZYNQMP_RTC_ERR_DEBUG
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 70b61b69c7a4..294465ef47ad 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -14,7 +14,6 @@ common-obj-$(CONFIG_IMX) += imx_epit.o
common-obj-$(CONFIG_IMX) += imx_gpt.o
common-obj-$(CONFIG_LM32) += lm32_timer.o
common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o
-common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o
common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index ce34b967db9f..1459d07237b9 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -70,9 +70,6 @@ cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset"
aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
-# xlnx-zynqmp-rtc.c
-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"
-
# nrf51_timer.c
nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
index d7483c3b4285..53076fa29a75 100644
--- a/include/hw/arm/xlnx-zynqmp.h
+++ b/include/hw/arm/xlnx-zynqmp.h
@@ -29,7 +29,7 @@
#include "hw/dma/xlnx-zdma.h"
#include "hw/display/xlnx_dp.h"
#include "hw/intc/xlnx-zynqmp-ipi.h"
-#include "hw/timer/xlnx-zynqmp-rtc.h"
+#include "hw/rtc/xlnx-zynqmp-rtc.h"
#include "hw/cpu/cluster.h"
#include "target/arm/cpu.h"
diff --git a/include/hw/timer/xlnx-zynqmp-rtc.h b/include/hw/rtc/xlnx-zynqmp-rtc.h
similarity index 95%
rename from include/hw/timer/xlnx-zynqmp-rtc.h
rename to include/hw/rtc/xlnx-zynqmp-rtc.h
index 97e32322ed70..6fa1cb2f43f8 100644
--- a/include/hw/timer/xlnx-zynqmp-rtc.h
+++ b/include/hw/rtc/xlnx-zynqmp-rtc.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2017 Xilinx Inc.
*
- * Written-by: Alistair Francis <alistair.francis@xilinx.com>
+ * Written-by: Alistair Francis
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
-#ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H
-#define HW_TIMER_XLNX_ZYNQMP_RTC_H
+#ifndef HW_RTC_XLNX_ZYNQMP_H
+#define HW_RTC_XLNX_ZYNQMP_H
#include "hw/register.h"
#include "hw/sysbus.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 15/19] hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (13 preceding siblings ...)
2019-10-25 8:35 ` [PULL 14/19] hw: Move Xilinx ZynqMP RTC " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 16/19] hw: Move Aspeed " Laurent Vivier
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-11-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/exynos4210_rtc.c | 0
hw/timer/Makefile.objs | 1 -
3 files changed, 1 insertion(+), 1 deletion(-)
rename hw/{timer => rtc}/exynos4210_rtc.c (100%)
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 543a550a0f11..3d4763fc269e 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -7,5 +7,6 @@ endif
common-obj-$(CONFIG_PL031) += pl031.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
+common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
diff --git a/hw/timer/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c
similarity index 100%
rename from hw/timer/exynos4210_rtc.c
rename to hw/rtc/exynos4210_rtc.c
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 294465ef47ad..33191d74cb98 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -19,7 +19,6 @@ common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o
common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
common-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o
common-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
common-obj-$(CONFIG_OMAP) += omap_gptimer.o
common-obj-$(CONFIG_OMAP) += omap_synctimer.o
common-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 16/19] hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (14 preceding siblings ...)
2019-10-25 8:35 ` [PULL 15/19] hw: Move Exynos4210 " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 17/19] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less Laurent Vivier
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Move RTC devices under the hw/rtc/ subdirectory.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-12-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/aspeed_rtc.c | 2 +-
hw/rtc/trace-events | 4 ++++
hw/timer/Makefile.objs | 2 +-
hw/timer/trace-events | 4 ----
include/hw/arm/aspeed_soc.h | 2 +-
include/hw/{timer => rtc}/aspeed_rtc.h | 6 +++---
7 files changed, 11 insertions(+), 10 deletions(-)
rename hw/{timer => rtc}/aspeed_rtc.c (99%)
rename include/hw/{timer => rtc}/aspeed_rtc.h (84%)
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 3d4763fc269e..8dc9fcd3a983 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -10,3 +10,4 @@ common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
+common-obj-$(CONFIG_ASPEED_SOC) += aspeed_rtc.o
diff --git a/hw/timer/aspeed_rtc.c b/hw/rtc/aspeed_rtc.c
similarity index 99%
rename from hw/timer/aspeed_rtc.c
rename to hw/rtc/aspeed_rtc.c
index 531301735334..3ca1183558b7 100644
--- a/hw/timer/aspeed_rtc.c
+++ b/hw/rtc/aspeed_rtc.c
@@ -8,7 +8,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "hw/timer/aspeed_rtc.h"
+#include "hw/rtc/aspeed_rtc.h"
#include "migration/vmstate.h"
#include "qemu/log.h"
#include "qemu/timer.h"
diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events
index 7f1945ad4cc6..d6749f4616a0 100644
--- a/hw/rtc/trace-events
+++ b/hw/rtc/trace-events
@@ -13,3 +13,7 @@ pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_alarm_raised(void) "alarm raised"
pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
+
+# aspeed-rtc.c
+aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
+aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 33191d74cb98..83091770df3a 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -29,7 +29,7 @@ common-obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o
common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o
+common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o
common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index 1459d07237b9..e18b87fc96dd 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -66,10 +66,6 @@ cmsdk_apb_dualtimer_read(uint64_t offset, uint64_t data, unsigned size) "CMSDK A
cmsdk_apb_dualtimer_write(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB dualtimer write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset"
-# hw/timer/aspeed-rtc.c
-aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
-aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
-
# nrf51_timer.c
nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
index cccb684a19bb..495c08be1b84 100644
--- a/include/hw/arm/aspeed_soc.h
+++ b/include/hw/arm/aspeed_soc.h
@@ -18,7 +18,7 @@
#include "hw/misc/aspeed_sdmc.h"
#include "hw/misc/aspeed_xdma.h"
#include "hw/timer/aspeed_timer.h"
-#include "hw/timer/aspeed_rtc.h"
+#include "hw/rtc/aspeed_rtc.h"
#include "hw/i2c/aspeed_i2c.h"
#include "hw/ssi/aspeed_smc.h"
#include "hw/watchdog/wdt_aspeed.h"
diff --git a/include/hw/timer/aspeed_rtc.h b/include/hw/rtc/aspeed_rtc.h
similarity index 84%
rename from include/hw/timer/aspeed_rtc.h
rename to include/hw/rtc/aspeed_rtc.h
index 15ba42912b7f..3fde854ad99c 100644
--- a/include/hw/timer/aspeed_rtc.h
+++ b/include/hw/rtc/aspeed_rtc.h
@@ -5,8 +5,8 @@
* Copyright 2019 IBM Corp
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef ASPEED_RTC_H
-#define ASPEED_RTC_H
+#ifndef HW_RTC_ASPEED_RTC_H
+#define HW_RTC_ASPEED_RTC_H
#include <stdint.h>
@@ -27,4 +27,4 @@ typedef struct AspeedRtcState {
#define TYPE_ASPEED_RTC "aspeed.rtc"
#define ASPEED_RTC(obj) OBJECT_CHECK(AspeedRtcState, (obj), TYPE_ASPEED_RTC)
-#endif /* ASPEED_RTC_H */
+#endif /* HW_RTC_ASPEED_RTC_H */
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 17/19] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (15 preceding siblings ...)
2019-10-25 8:35 ` [PULL 16/19] hw: Move Aspeed " Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 18/19] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include Laurent Vivier
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Only 2 source files require the "mc146818rtc_regs.h" header.
Instead of having it processed 12 times, by all objects
using "mc146818rtc.h", include it directly where used.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191003230404.19384-13-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/mc146818rtc.c | 1 +
hw/timer/hpet.c | 1 +
include/hw/rtc/mc146818rtc.h | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index ced15f764fc1..9d4ed54f65e2 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -35,6 +35,7 @@
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "hw/rtc/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h"
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 02bf8a8ce8fc..9f17aaa278e2 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -34,6 +34,7 @@
#include "hw/timer/hpet.h"
#include "hw/sysbus.h"
#include "hw/rtc/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
index 2e9331637a6d..7fa59d4279c5 100644
--- a/include/hw/rtc/mc146818rtc.h
+++ b/include/hw/rtc/mc146818rtc.h
@@ -10,7 +10,6 @@
#define HW_RTC_MC146818RTC_H
#include "hw/isa/isa.h"
-#include "hw/rtc/mc146818rtc_regs.h"
#define TYPE_MC146818_RTC "mc146818rtc"
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 18/19] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (16 preceding siblings ...)
2019-10-25 8:35 ` [PULL 17/19] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 8:35 ` [PULL 19/19] hw/rtc/aspeed_rtc: Remove unused includes Laurent Vivier
2019-10-25 13:59 ` [PULL 00/19] Trivial branch patches Peter Maydell
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The "hw/ptimer.h" header is not used, remove it.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-14-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/xlnx-zynqmp-rtc.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c
index f9f09b72965a..2bcd14d7795d 100644
--- a/hw/rtc/xlnx-zynqmp-rtc.c
+++ b/hw/rtc/xlnx-zynqmp-rtc.c
@@ -32,7 +32,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/irq.h"
-#include "hw/ptimer.h"
#include "qemu/cutils.h"
#include "sysemu/sysemu.h"
#include "trace.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PULL 19/19] hw/rtc/aspeed_rtc: Remove unused includes
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (17 preceding siblings ...)
2019-10-25 8:35 ` [PULL 18/19] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include Laurent Vivier
@ 2019-10-25 8:35 ` Laurent Vivier
2019-10-25 13:59 ` [PULL 00/19] Trivial branch patches Peter Maydell
19 siblings, 0 replies; 21+ messages in thread
From: Laurent Vivier @ 2019-10-25 8:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Peter Maydell, Michael S. Tsirkin, Michael Tokarev,
Alistair Francis, Edgar E. Iglesias, qemu-block, qemu-trivial,
Helge Deller, Hervé Poussineau, Joel Stanley, David Gibson,
Philippe Mathieu-Daudé,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Laurent Vivier,
Aleksandar Rikalo, qemu-ppc, Aleksandar Markovic, Paolo Bonzini,
Aurelien Jarno
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The system <stdint.h> include is already provided by "osdep.h"
(the scripts/clean-includes file clean such headers).
Commit 64552b6be47 suggests we don't need to include "hw/irq.h":
Move the qemu_irq and qemu_irq_handler typedefs from hw/irq.h to
qemu/typedefs.h, and then include hw/irq.h only where it's still
needed.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-15-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/rtc/aspeed_rtc.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/include/hw/rtc/aspeed_rtc.h b/include/hw/rtc/aspeed_rtc.h
index 3fde854ad99c..b94a7102688a 100644
--- a/include/hw/rtc/aspeed_rtc.h
+++ b/include/hw/rtc/aspeed_rtc.h
@@ -8,9 +8,6 @@
#ifndef HW_RTC_ASPEED_RTC_H
#define HW_RTC_ASPEED_RTC_H
-#include <stdint.h>
-
-#include "hw/irq.h"
#include "hw/sysbus.h"
typedef struct AspeedRtcState {
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PULL 00/19] Trivial branch patches
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
` (18 preceding siblings ...)
2019-10-25 8:35 ` [PULL 19/19] hw/rtc/aspeed_rtc: Remove unused includes Laurent Vivier
@ 2019-10-25 13:59 ` Peter Maydell
19 siblings, 0 replies; 21+ messages in thread
From: Peter Maydell @ 2019-10-25 13:59 UTC (permalink / raw)
To: Laurent Vivier
Cc: Fam Zheng, Michael S. Tsirkin, Michael Tokarev, QEMU Developers,
Edgar E. Iglesias, Qemu-block, QEMU Trivial, Helge Deller,
Hervé Poussineau, Joel Stanley, David Gibson,
Artyom Tarasenko, Laurent Vivier, Thomas Huth, Eduardo Habkost,
Mark Cave-Ayland, Alistair Francis, qemu-arm,
Cédric Le Goater, Stefan Hajnoczi, Igor Mammedov,
Richard Henderson, Andrew Jeffery, Aleksandar Rikalo, qemu-ppc,
Aleksandar Markovic, Paolo Bonzini, Aurelien Jarno
On Fri, 25 Oct 2019 at 09:35, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
>
> Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
>
> for you to fetch changes up to fabb862f76f093cdd1610571de9ba714d3333c1c:
>
> hw/rtc/aspeed_rtc: Remove unused includes (2019-10-24 20:35:28 +0200)
>
> ----------------------------------------------------------------
> Fix typos and docs, trivial changes and RTC devices split
>
> ----------------------------------------------------------------
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2019-10-25 14:09 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-25 8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
2019-10-25 8:34 ` [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter Laurent Vivier
2019-10-25 8:34 ` [PULL 02/19] pci_bridge: fix a typo in comment Laurent Vivier
2019-10-25 8:34 ` [PULL 03/19] util/async: avoid useless cast Laurent Vivier
2019-10-25 8:34 ` [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup Laurent Vivier
2019-10-25 8:34 ` [PULL 05/19] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms Laurent Vivier
2019-10-25 8:34 ` [PULL 06/19] hw/timer: Compile devices not target-dependent as common object Laurent Vivier
2019-10-25 8:34 ` [PULL 07/19] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory Laurent Vivier
2019-10-25 8:35 ` [PULL 08/19] hw: Move MC146818 " Laurent Vivier
2019-10-25 8:35 ` [PULL 09/19] hw: Move M48T59 " Laurent Vivier
2019-10-25 8:35 ` [PULL 10/19] hw: Move M41T80 " Laurent Vivier
2019-10-25 8:35 ` [PULL 11/19] hw: Move sun4v hypervisor RTC " Laurent Vivier
2019-10-25 8:35 ` [PULL 12/19] hw: Move TWL92230 device " Laurent Vivier
2019-10-25 8:35 ` [PULL 13/19] hw: Move DS1338 " Laurent Vivier
2019-10-25 8:35 ` [PULL 14/19] hw: Move Xilinx ZynqMP RTC " Laurent Vivier
2019-10-25 8:35 ` [PULL 15/19] hw: Move Exynos4210 " Laurent Vivier
2019-10-25 8:35 ` [PULL 16/19] hw: Move Aspeed " Laurent Vivier
2019-10-25 8:35 ` [PULL 17/19] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less Laurent Vivier
2019-10-25 8:35 ` [PULL 18/19] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include Laurent Vivier
2019-10-25 8:35 ` [PULL 19/19] hw/rtc/aspeed_rtc: Remove unused includes Laurent Vivier
2019-10-25 13:59 ` [PULL 00/19] Trivial branch patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).