diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-02-23 13:45:24 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 13:36:03 -0600 |
| commit | 62aeb0f765ea1f4a305a1963e66e94f7be9ac054 (patch) | |
| tree | 27a952593c430a08b713dc1f13a8e654a8df62c7 /hw | |
| parent | 9826fd597df59a8bac7beafd192e4baad790c31a (diff) | |
suspend: make rtc alarm wakeup the guest.
Make the rtc wake up the guest when the alarm fires.
Add acpi windup to property support RTC_EN, so guests
can enable and disable this.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi.c | 7 | ||||
| -rw-r--r-- | hw/mc146818rtc.c | 1 |
2 files changed, 8 insertions, 0 deletions
@@ -254,6 +254,10 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) WakeupReason *reason = data; switch (*reason) { + case QEMU_WAKEUP_REASON_RTC: + ar->pm1.evt.sts |= + (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_RT_CLOCK_STATUS); + break; case QEMU_WAKEUP_REASON_OTHER: default: /* ACPI_BITMASK_WAKE_STATUS should be set on resume. @@ -287,6 +291,8 @@ void acpi_pm1_evt_write_sts(ACPIREGS *ar, uint16_t val) void acpi_pm1_evt_write_en(ACPIREGS *ar, uint16_t val) { ar->pm1.evt.en = val; + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_RTC, + val & ACPI_BITMASK_RT_CLOCK_ENABLE); } void acpi_pm1_evt_power_down(ACPIREGS *ar) @@ -301,6 +307,7 @@ void acpi_pm1_evt_reset(ACPIREGS *ar) { ar->pm1.evt.sts = 0; ar->pm1.evt.en = 0; + qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_RTC, 0); } /* ACPI PM_TMR */ diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index ee7a02ff93..a46fdfc487 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -437,6 +437,7 @@ static void rtc_update_second2(void *opaque) s->cmos_data[RTC_REG_C] |= REG_C_AF; if (s->cmos_data[RTC_REG_B] & REG_B_AIE) { + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_RTC); qemu_irq_raise(s->irq); s->cmos_data[RTC_REG_C] |= REG_C_IRQF; } |