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
