From patchwork Wed Feb 8 11:00:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 140121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7F477B71A6 for ; Wed, 8 Feb 2012 22:18:39 +1100 (EST) Received: from localhost ([::1]:38355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv5H8-00066L-St for incoming@patchwork.ozlabs.org; Wed, 08 Feb 2012 06:01:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:40166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv5GM-0004St-Jm for qemu-devel@nongnu.org; Wed, 08 Feb 2012 06:00:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rv5GG-0007oj-FG for qemu-devel@nongnu.org; Wed, 08 Feb 2012 06:00:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv5GG-0007oF-7s for qemu-devel@nongnu.org; Wed, 08 Feb 2012 06:00:28 -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 q18B0QU0028719 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Feb 2012 06:00:26 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q18B0Oxm007192; Wed, 8 Feb 2012 06:00:25 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 3A66341539; Wed, 8 Feb 2012 12:00:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 8 Feb 2012 12:00:19 +0100 Message-Id: <1328698819-31269-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1328698819-31269-1-git-send-email-kraxel@redhat.com> References: <1328698819-31269-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: xen-devel@lists.xensource.com, Gerd Hoffmann Subject: [Qemu-devel] [PATCH v3 6/6] suspend: make rtc alarm wakeup the guest. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a 'wakeup' property to the mc146818rtc. It is on by default. When enabled the rtc will wake up the guest when the alarm fires. Signed-off-by: Gerd Hoffmann --- hw/mc146818rtc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 314ed52..3b912c6 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -86,6 +86,7 @@ typedef struct RTCState { uint8_t cmos_index; struct tm current_tm; int32_t base_year; + uint32_t wakeup; qemu_irq irq; qemu_irq sqw_irq; int it_shift; @@ -437,6 +438,9 @@ 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) { + if (s->wakeup) { + qemu_system_wakeup_request(); + } qemu_irq_raise(s->irq); s->cmos_data[RTC_REG_C] |= REG_C_IRQF; } @@ -725,6 +729,7 @@ static Property mc146818rtc_properties[] = { DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980), DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState, lost_tick_policy, LOST_TICK_DISCARD), + DEFINE_PROP_UINT32("wakeup", RTCState, wakeup, 1), DEFINE_PROP_END_OF_LIST(), };