[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 11/12] suspend: make acpi timer wakeup the guest.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v6 11/12] suspend: make acpi timer wakeup the guest. |
Date: |
Thu, 23 Feb 2012 13:45:25 +0100 |
Make the acpi timer wake up the guest.
Guests can enable/disable this via acpi too.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi.c | 8 ++++++++
sysemu.h | 1 +
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/hw/acpi.c b/hw/acpi.c
index c05dde6..5d521e5 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -258,6 +258,10 @@ static void acpi_notify_wakeup(Notifier *notifier, void
*data)
ar->pm1.evt.sts |=
(ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_RT_CLOCK_STATUS);
break;
+ case QEMU_WAKEUP_REASON_PMTIMER:
+ ar->pm1.evt.sts |=
+ (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_TIMER_STATUS);
+ break;
case QEMU_WAKEUP_REASON_OTHER:
default:
/* ACPI_BITMASK_WAKE_STATUS should be set on resume.
@@ -293,6 +297,8 @@ 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);
+ qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_PMTIMER,
+ val & ACPI_BITMASK_TIMER_ENABLE);
}
void acpi_pm1_evt_power_down(ACPIREGS *ar)
@@ -308,6 +314,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);
+ qemu_system_wakeup_enable(QEMU_WAKEUP_REASON_PMTIMER, 0);
}
/* ACPI PM_TMR */
@@ -340,6 +347,7 @@ uint32_t acpi_pm_tmr_get(ACPIREGS *ar)
static void acpi_pm_tmr_timer(void *opaque)
{
ACPIREGS *ar = opaque;
+ qemu_system_wakeup_request(QEMU_WAKEUP_REASON_PMTIMER);
ar->tmr.update_sci(ar);
}
diff --git a/sysemu.h b/sysemu.h
index 781bdaf..98118cc 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -41,6 +41,7 @@ void vm_stop_force_state(RunState state);
typedef enum WakeupReason {
QEMU_WAKEUP_REASON_OTHER = 0,
QEMU_WAKEUP_REASON_RTC,
+ QEMU_WAKEUP_REASON_PMTIMER,
} WakeupReason;
void qemu_system_reset_request(void);
--
1.7.1
- [Qemu-devel] [PATCH v6 00/12] initial suspend support, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 01/12] acpi: move around structs, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 04/12] acpi: add acpi_pm1_evt_write_en, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 10/12] suspend: make rtc alarm wakeup the guest., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 03/12] acpi: don't pass overflow_time to acpi_pm1_evt_get_sts, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 02/12] acpi: add ACPIREGS, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 12/12] suspend: add qmp events, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 09/12] suspend: make serial ports wakeup the guest., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 11/12] suspend: make acpi timer wakeup the guest.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v6 06/12] suspend: switch acpi s3 to new infrastructure., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 08/12] suspend: make ps/2 devices wakeup the guest, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 07/12] suspend: add system_wakeup monitor command, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 05/12] suspend: add infrastructure, Gerd Hoffmann, 2012/02/23
- Re: [Qemu-devel] [PATCH v6 00/12] initial suspend support, Anthony Liguori, 2012/02/24