| Message ID | 20100705083634.GL4689@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/05/2010 03:36 AM, Gleb Natapov wrote: > Convert alarm time from BCD if needed before comparing with current > time. > > Signed-off-by: Gleb Natapov<gleb@redhat.com> > Applied. Thanks. Regards, Anthony Liguori > diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c > index c3459bf..2b91fa8 100644 > --- a/hw/mc146818rtc.c > +++ b/hw/mc146818rtc.c > @@ -214,7 +214,6 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) > case RTC_SECONDS_ALARM: > case RTC_MINUTES_ALARM: > case RTC_HOURS_ALARM: > - /* XXX: not supported */ > s->cmos_data[s->cmos_index] = data; > break; > case RTC_SECONDS: > @@ -414,11 +413,11 @@ static void rtc_update_second2(void *opaque) > /* check alarm */ > if (s->cmos_data[RTC_REG_B]& REG_B_AIE) { > if (((s->cmos_data[RTC_SECONDS_ALARM]& 0xc0) == 0xc0 || > - s->cmos_data[RTC_SECONDS_ALARM] == s->current_tm.tm_sec)&& > + rtc_from_bcd(s, s->cmos_data[RTC_SECONDS_ALARM]) == s->current_tm.tm_sec)&& > ((s->cmos_data[RTC_MINUTES_ALARM]& 0xc0) == 0xc0 || > - s->cmos_data[RTC_MINUTES_ALARM] == s->current_tm.tm_mon)&& > + rtc_from_bcd(s, s->cmos_data[RTC_MINUTES_ALARM]) == s->current_tm.tm_min)&& > ((s->cmos_data[RTC_HOURS_ALARM]& 0xc0) == 0xc0 || > - s->cmos_data[RTC_HOURS_ALARM] == s->current_tm.tm_hour)) { > + rtc_from_bcd(s, s->cmos_data[RTC_HOURS_ALARM]) == s->current_tm.tm_hour)) { > > s->cmos_data[RTC_REG_C] |= 0xa0; > qemu_irq_raise(s->irq); > -- > Gleb. > > >
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index c3459bf..2b91fa8 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -214,7 +214,6 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) case RTC_SECONDS_ALARM: case RTC_MINUTES_ALARM: case RTC_HOURS_ALARM: - /* XXX: not supported */ s->cmos_data[s->cmos_index] = data; break; case RTC_SECONDS: @@ -414,11 +413,11 @@ static void rtc_update_second2(void *opaque) /* check alarm */ if (s->cmos_data[RTC_REG_B] & REG_B_AIE) { if (((s->cmos_data[RTC_SECONDS_ALARM] & 0xc0) == 0xc0 || - s->cmos_data[RTC_SECONDS_ALARM] == s->current_tm.tm_sec) && + rtc_from_bcd(s, s->cmos_data[RTC_SECONDS_ALARM]) == s->current_tm.tm_sec) && ((s->cmos_data[RTC_MINUTES_ALARM] & 0xc0) == 0xc0 || - s->cmos_data[RTC_MINUTES_ALARM] == s->current_tm.tm_mon) && + rtc_from_bcd(s, s->cmos_data[RTC_MINUTES_ALARM]) == s->current_tm.tm_min) && ((s->cmos_data[RTC_HOURS_ALARM] & 0xc0) == 0xc0 || - s->cmos_data[RTC_HOURS_ALARM] == s->current_tm.tm_hour)) { + rtc_from_bcd(s, s->cmos_data[RTC_HOURS_ALARM]) == s->current_tm.tm_hour)) { s->cmos_data[RTC_REG_C] |= 0xa0; qemu_irq_raise(s->irq);
Convert alarm time from BCD if needed before comparing with current time. Signed-off-by: Gleb Natapov <gleb@redhat.com> -- Gleb.