Failed in applying to current master (
apply log)
MAINTAINERS | 2 +
include/hw/acpi/acpi.h | 3 +
include/hw/hyperv/hyperv-proto.h | 12 ++
include/hw/sd/sdhci.h | 2 +-
include/hw/xen/arch_hvm.h | 2 +-
include/system/arch_init.h | 2 +-
target/i386/kvm/hyperv-proto.h | 12 --
hw/acpi/acpi-stub.c | 8 ++
hw/acpi/core.c | 5 +
hw/arm/fsl-imx25.c | 2 -
hw/arm/fsl-imx6.c | 2 -
hw/arm/fsl-imx6ul.c | 2 -
hw/arm/fsl-imx7.c | 2 -
hw/arm/fsl-imx8mp.c | 2 -
hw/i386/fw_cfg.c | 8 +-
hw/net/smc91c111.c | 148 ++++++++++++++++---
hw/ppc/e500.c | 1 +
hw/rtc/rs5c372.c | 236 +++++++++++++++++++++++++++++++
hw/scsi/scsi-disk.c | 2 +-
hw/sd/sdhci.c | 18 ++-
hw/virtio/virtio-mem.c | 6 +-
system/arch_init.c | 19 +--
system/globals-target.c | 24 ++++
system/qdev-monitor.c | 4 +-
system/vl.c | 6 +-
tests/qtest/rs5c372-test.c | 43 ++++++
hw/rtc/Kconfig | 5 +
hw/rtc/meson.build | 1 +
hw/rtc/trace-events | 4 +
system/meson.build | 1 +
tests/qtest/meson.build | 1 +
31 files changed, 503 insertions(+), 82 deletions(-)
create mode 100644 hw/rtc/rs5c372.c
create mode 100644 system/globals-target.c
create mode 100644 tests/qtest/rs5c372-test.c