From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxc6E-0006ss-TD for qemu-devel@nongnu.org; Wed, 15 Feb 2012 05:28:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rxc6D-0000gj-09 for qemu-devel@nongnu.org; Wed, 15 Feb 2012 05:28:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxc6C-0000gN-OR for qemu-devel@nongnu.org; Wed, 15 Feb 2012 05:28:32 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1FASWSh030129 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 15 Feb 2012 05:28:32 -0500 From: Gerd Hoffmann Date: Wed, 15 Feb 2012 11:28:20 +0100 Message-Id: <1329301701-30395-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1329301701-30395-1-git-send-email-kraxel@redhat.com> References: <1329301701-30395-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v5 11/12] suspend: make acpi timer wakeup the guest. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Make the acpi timer wake up the guest. Guests can enable/disable this via acpi too. Signed-off-by: Gerd Hoffmann --- 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