diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-19 14:34:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-19 14:34:17 +0000 |
| commit | adf02c4419e9ac4b3d9a16efdb7e3089c19ae246 (patch) | |
| tree | 64fa9e44b78ec9de53545f2b32f32eec550bcf45 /hw/timer/mc146818rtc.c | |
| parent | e85c577158a2e8e252414959da9ef15c12eec63d (diff) | |
| parent | ce1a1aec47877a281d69dbc2e65f86bfe8fea231 (diff) | |
| download | focaccia-qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.gz focaccia-qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-18' into staging
QAPI patches for 2018-12-18 # gpg: Signature made Tue 18 Dec 2018 07:20:11 GMT # gpg: using RSA key 3870B400EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qapi-2018-12-18: qapi: fix flat union on uncovered branches conditionals qmp hmp: Make system_wakeup check wake-up support and run state qga: update guest-suspend-ram and guest-suspend-hybrid descriptions qmp: query-current-machine with wakeup-suspend-support qmp: Split ShutdownCause host-qmp into quit and system-reset qmp: Add reason to SHUTDOWN and RESET events qapi: Turn ShutdownCause into QAPI enum Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/mc146818rtc.c')
| -rw-r--r-- | hw/timer/mc146818rtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index e4e4de8b8a..69483152c3 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -455,7 +455,7 @@ static void rtc_update_timer(void *opaque) if (qemu_clock_get_ns(rtc_clock) >= s->next_alarm_time) { irqs |= REG_C_AF; if (s->cmos_data[RTC_REG_B] & REG_B_AIE) { - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_RTC); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_RTC, NULL); } } |