From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvPoS-0001WH-0u for qemu-devel@nongnu.org; Thu, 09 Feb 2012 03:57:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvPoM-0002UV-CB for qemu-devel@nongnu.org; Thu, 09 Feb 2012 03:57:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvPoL-0002UO-TY for qemu-devel@nongnu.org; Thu, 09 Feb 2012 03:57:02 -0500 Date: Thu, 9 Feb 2012 10:56:58 +0200 From: Gleb Natapov Message-ID: <20120209085658.GE18866@redhat.com> References: <1328698819-31269-1-git-send-email-kraxel@redhat.com> <1328698819-31269-7-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1328698819-31269-7-git-send-email-kraxel@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 6/6] suspend: make rtc alarm wakeup the guest. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: xen-devel@lists.xensource.com, qemu-devel@nongnu.org On Wed, Feb 08, 2012 at 12:00:19PM +0100, Gerd Hoffmann wrote: > 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(); > + } RTC should do wakeup only if RTC_EN bit is set pm1en. > 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(), > }; > > -- > 1.7.1 > > -- Gleb. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCH v3 6/6] suspend: make rtc alarm wakeup the guest. Date: Thu, 9 Feb 2012 10:56:58 +0200 Message-ID: <20120209085658.GE18866@redhat.com> References: <1328698819-31269-1-git-send-email-kraxel@redhat.com> <1328698819-31269-7-git-send-email-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1328698819-31269-7-git-send-email-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: Gerd Hoffmann Cc: xen-devel@lists.xensource.com, qemu-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org On Wed, Feb 08, 2012 at 12:00:19PM +0100, Gerd Hoffmann wrote: > 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(); > + } RTC should do wakeup only if RTC_EN bit is set pm1en. > 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(), > }; > > -- > 1.7.1 > > -- Gleb.