From patchwork Fri Jul 20 10:53:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172206 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ACFB72C0091 for ; Fri, 20 Jul 2012 21:36:24 +1000 (EST) Received: from localhost ([::1]:60922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsArK-00076U-6J for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 06:54:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsAqc-0004x1-Ch for qemu-devel@nongnu.org; Fri, 20 Jul 2012 06:54:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsAqX-0001Z2-Tf for qemu-devel@nongnu.org; Fri, 20 Jul 2012 06:54:14 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:51109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsAqX-0001Wc-Nr for qemu-devel@nongnu.org; Fri, 20 Jul 2012 06:54:09 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so5957264pbb.4 for ; Fri, 20 Jul 2012 03:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=n83WoPn0VbtlbJNTp5p5d/7WUZCorQaCvXPXvCCbBY0=; b=Vo/D3r0VFPHIgWFXCGQOv81jMvslCW4VA2zQ2Y52/E3Ca0LP0W2mEqLFoO2Yz+yHq5 h77DyG+Jwk3un1JY3JS7xpTzbRw6JqvhZV5VurLGaYex2RJThl1NgfIHWpFc268f3/Xz MSHX/+ZnvLUx2wm5+08VzFr14GK4f2cPNKbRPW+UqiHa1FW6K2xYu2H89T/nLbBM/9xI wRnuIgNIkM6blrsyC78UyvM7iblEZ9LKlnIxcXKAx1E3uZzK6OiVV59f0XlR/wN5R0zA AszyNC86TtNQkDmkpjZmUp4F95ZWJ+QJF+lesrm0Axz0CdDOB3MVR0OERzKVD/JLZN1a 3D5g== Received: by 10.68.138.170 with SMTP id qr10mr9730772pbb.120.1342781649328; Fri, 20 Jul 2012 03:54:09 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id oi5sm3758710pbb.39.2012.07.20.03.54.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 03:54:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2012 12:53:48 +0200 Message-Id: <1342781633-7288-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342781633-7288-1-git-send-email-pbonzini@redhat.com> References: <1342781633-7288-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: "Zhang, Yang Z" Subject: [Qemu-devel] [PATCH 2/7] RTC: Rename rtc_timer_update 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 From: "Zhang, Yang Z" Signed-off-by: Yang Zhang Signed-off-by: Paolo Bonzini --- hw/mc146818rtc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 1ccfb50..6a7dcb8 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -110,7 +110,7 @@ static void rtc_coalesced_timer(void *opaque) } #endif -static void rtc_timer_update(RTCState *s, int64_t current_time) +static void periodic_timer_update(RTCState *s, int64_t current_time) { int period_code, period; int64_t cur_clock, next_irq_clock; @@ -148,7 +148,7 @@ static void rtc_periodic_timer(void *opaque) { RTCState *s = opaque; - rtc_timer_update(s, s->next_periodic_time); + periodic_timer_update(s, s->next_periodic_time); s->cmos_data[RTC_REG_C] |= REG_C_PF; if (s->cmos_data[RTC_REG_B] & REG_B_PIE) { s->cmos_data[RTC_REG_C] |= REG_C_IRQF; @@ -207,7 +207,7 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) /* UIP bit is read only */ s->cmos_data[RTC_REG_A] = (data & ~REG_A_UIP) | (s->cmos_data[RTC_REG_A] & REG_A_UIP); - rtc_timer_update(s, qemu_get_clock_ns(rtc_clock)); + periodic_timer_update(s, qemu_get_clock_ns(rtc_clock)); break; case RTC_REG_B: if (data & REG_B_SET) { @@ -221,7 +221,7 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) } } s->cmos_data[RTC_REG_B] = data; - rtc_timer_update(s, qemu_get_clock_ns(rtc_clock)); + periodic_timer_update(s, qemu_get_clock_ns(rtc_clock)); break; case RTC_REG_C: case RTC_REG_D: @@ -550,7 +550,7 @@ static void rtc_notify_clock_reset(Notifier *notifier, void *data) rtc_set_date_from_host(&s->dev); s->next_second_time = now + (get_ticks_per_sec() * 99) / 100; qemu_mod_timer(s->second_timer2, s->next_second_time); - rtc_timer_update(s, now); + periodic_timer_update(s, now); #ifdef TARGET_I386 if (s->lost_tick_policy == LOST_TICK_SLEW) { rtc_coalesced_timer_update(s);