From patchwork Wed Aug 1 16:41:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 174548 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 554FC2C00A4 for ; Thu, 2 Aug 2012 03:27:57 +1000 (EST) Received: from localhost ([::1]:33664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swc0w-00074J-Fq for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 12:43:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swc0P-0005nx-1M for qemu-devel@nongnu.org; Wed, 01 Aug 2012 12:42:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Swc0N-0004vq-0r for qemu-devel@nongnu.org; Wed, 01 Aug 2012 12:42:40 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swc0M-0004tO-QL for qemu-devel@nongnu.org; Wed, 01 Aug 2012 12:42:38 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1278230pbb.4 for ; Wed, 01 Aug 2012 09:42:38 -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=GlkrGL+rYkuChsAiNX4ce2bsWLuq+CmVWMndv1VWnhM=; b=Kmyo+SSZ5aTXqy9zeUH3dRLuwPCKAD1zupxkSVisIuLce1jMyPtPASLg2C9KrVNFFx W5TdrHQCmPEGczOsnbY45pToaosAWYiMOTxirs12Mvt7mjj+4ZGmKMBZ5FZfYdTME8PT ZMQXM91V/HH49EuQjwRrWFkvm/T4TiFbikiYiYqxeT3I2FBYzjWwWw8rtOxh+3twP2BN +bTu3rfHnFLQcmwxnsHoCDqnRJ5MUywW/wyCvxKs2FmqarDS4lYbjh6ygL5axJjrSFak CUm20wodxQ2lhyGtAvGPlOI2dA60PWZijNibHFmKEolo/AJ0UkBkf0bjXVNO6x7Ere+S 1UdQ== Received: by 10.68.223.35 with SMTP id qr3mr54342767pbc.83.1343839358029; Wed, 01 Aug 2012 09:42:38 -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 ru10sm2892956pbc.50.2012.08.01.09.42.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 09:42:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 1 Aug 2012 18:41:51 +0200 Message-Id: <1343839312-24030-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343839312-24030-1-git-send-email-pbonzini@redhat.com> References: <1343839312-24030-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: yang.z.zhang@intel.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 09/10] RTC: Remove the current_tm field 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 This is not used anymore and only written to. Signed-off-by: Paolo Bonzini --- hw/mc146818rtc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index a69ddc3..57a481a 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -59,7 +59,6 @@ typedef struct RTCState { MemoryRegion io; uint8_t cmos_data[128]; uint8_t cmos_index; - struct tm current_tm; int32_t base_year; uint64_t base_rtc; uint64_t last_update; @@ -522,7 +521,6 @@ static void rtc_set_time(RTCState *s) struct tm tm; rtc_get_time(s, &tm); - s->current_tm = *tm; s->base_rtc = mktimegm(&tm); s->last_update = qemu_get_clock_ns(rtc_clock); @@ -564,7 +562,6 @@ static void rtc_update_time(RTCState *s) guest_sec = guest_nsec / NSEC_PER_SEC; ret = gmtime(&guest_sec); rtc_set_cmos(s, ret); - s->current_tm = *ret; } static int update_in_progress(RTCState *s) @@ -680,7 +677,6 @@ static void rtc_set_date_from_host(ISADevice *dev) /* set the CMOS date */ rtc_set_cmos(s, &tm); - s->current_tm = tm; val = rtc_to_bcd(s, (tm.tm_year / 100) + 19); rtc_set_memory(dev, REG_IBM_CENTURY_BYTE, val); @@ -710,13 +706,6 @@ static const VMStateDescription vmstate_rtc = { .fields = (VMStateField []) { VMSTATE_BUFFER(cmos_data, RTCState), VMSTATE_UINT8(cmos_index, RTCState), - VMSTATE_INT32(current_tm.tm_sec, RTCState), - VMSTATE_INT32(current_tm.tm_min, RTCState), - VMSTATE_INT32(current_tm.tm_hour, RTCState), - VMSTATE_INT32(current_tm.tm_wday, RTCState), - VMSTATE_INT32(current_tm.tm_mday, RTCState), - VMSTATE_INT32(current_tm.tm_mon, RTCState), - VMSTATE_INT32(current_tm.tm_year, RTCState), VMSTATE_TIMER(periodic_timer, RTCState), VMSTATE_INT64(next_periodic_time, RTCState), VMSTATE_UINT32_V(irq_coalesced, RTCState, 2),