From patchwork Thu Aug 2 16:04:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 174777 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 B6A1C2C0088 for ; Fri, 3 Aug 2012 02:04:57 +1000 (EST) Received: from localhost ([::1]:33479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwxtP-0003vH-Mk for incoming@patchwork.ozlabs.org; Thu, 02 Aug 2012 12:04:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swxt3-0003sH-G9 for qemu-devel@nongnu.org; Thu, 02 Aug 2012 12:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Swxsx-0001uC-Kb for qemu-devel@nongnu.org; Thu, 02 Aug 2012 12:04:33 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:37819) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swxsx-0001u8-GF for qemu-devel@nongnu.org; Thu, 02 Aug 2012 12:04:27 -0400 Received: by ghrr14 with SMTP id r14so8584277ghr.4 for ; Thu, 02 Aug 2012 09:04:27 -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=9MUpxMl0aj3eb4XNiTlabJVSr8VN0Ol1bF7egqke0Gc=; b=VvmlCjgXxTbq2D+fzm6t0AaTIQGm9CIrLByiP42T7Lj1IZUjolqOQ+wBeX/tN2dBOZ SS7dJ1p1G1FnKoFlWyZh+I+GgY6ca0822VQZBk/whqNkSlFePIG4TzeQtPEvuBUeqlZI dcUYmJr1DogfN82KyEh+VjuPrmKKgZ5I38IDs3qIFpTacBBl4Mnae0Qo+TsXtpuMJ1RX l2a+B2PE54ml9eEWzlpKCsNxx4scGZwSDMgepYVW5jDWyuM6plENnCtmb6M2EkewCXGV na1PslDNS5Z1ShseyDBWYB83TfaZrvdT1HqWZVXrYsS06JMYkwGuUJ9c294gxOUBNFEu EoEw== Received: by 10.43.46.194 with SMTP id up2mr4730245icb.22.1343923466758; Thu, 02 Aug 2012 09:04:26 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id wm7sm13332071igb.6.2012.08.02.09.04.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 09:04:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 2 Aug 2012 18:04:04 +0200 Message-Id: <1343923453-13026-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343923453-13026-1-git-send-email-pbonzini@redhat.com> References: <1343923453-13026-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.173 Cc: yang.z.zhang@intel.com, aliguori@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v3 01/10] RTC: Remove the logic to update time format when DM bit changed 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: Yang Zhang Changing the DM (binary/BCD) and 24/12 control bit doesn't affect the internal registers. It only indicates what format is used for those registers. Signed-off-by: Yang Zhang Signed-off-by: Paolo Bonzini --- hw/mc146818rtc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 3777f85..6e5b2f0 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -220,15 +220,7 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) rtc_set_time(s); } } - if (((s->cmos_data[RTC_REG_B] ^ data) & (REG_B_DM | REG_B_24H)) && - !(data & REG_B_SET)) { - /* If the time format has changed and not in set mode, - update the registers immediately. */ - s->cmos_data[RTC_REG_B] = data; - rtc_copy_date(s); - } else { - s->cmos_data[RTC_REG_B] = data; - } + s->cmos_data[RTC_REG_B] = data; rtc_timer_update(s, qemu_get_clock_ns(rtc_clock)); break; case RTC_REG_C: