From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnSpv-00010N-Mm for qemu-devel@nongnu.org; Wed, 18 Jan 2012 05:33:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RnSpq-0006oT-4c for qemu-devel@nongnu.org; Wed, 18 Jan 2012 05:33:47 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:54353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnSpp-0006jD-Uc for qemu-devel@nongnu.org; Wed, 18 Jan 2012 05:33:42 -0500 Received: by mail-iy0-f173.google.com with SMTP id o4so12460633iae.4 for ; Wed, 18 Jan 2012 02:33:41 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jan 2012 11:33:09 +0100 Message-Id: <1326882794-31816-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1326882794-31816-1-git-send-email-pbonzini@redhat.com> References: <1326882794-31816-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 4/9] rtc-test: fix set_alarm_time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org GCC (correctly) reports uninitialized variables. Signed-off-by: Paolo Bonzini --- tests/rtc-test.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 7f0b590..1645b34 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -195,26 +195,12 @@ static void dec_check_time(void) static void set_alarm_time(struct tm *tm) { - int sec, min, hour; - int hour_offset; - - sec = tm->tm_sec - 1; + int sec; + sec = tm->tm_sec; if ((cmos_read(RTC_REG_B) & REG_B_DM) == 0) { sec = dec2bcd(sec); - min = dec2bcd(min); - hour = dec2bcd(hour); - hour_offset = 80; - } else { - hour_offset = 0x80; - } - - if ((cmos_read(RTC_REG_B) & REG_B_24H) != 0) { - if (hour >= 12) { - hour -= 12; - hour += hour_offset; - } } cmos_write(RTC_SECONDS_ALARM, sec); @@ -236,11 +222,11 @@ static void alarm_time(void) g_assert(!get_irq(RTC_ISA_IRQ)); - now.tm_sec += 1; + now.tm_sec = (now.tm_sec + 2) % 60; set_alarm_time(&now); cmos_write(RTC_REG_B, cmos_read(RTC_REG_B) | REG_B_AIE); - for (i = 0; i < 1 + wiggle; i++) { + for (i = 0; i < 2 + wiggle; i++) { if (get_irq(RTC_ISA_IRQ)) { break; } -- 1.7.7.1