qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: yang.z.zhang@intel.com, aliguori@linux.vnet.ibm.com,
	mdroth@linux.vnet.ibm.com, quintela@redhat.com
Subject: [Qemu-devel] [PATCH v3 10/10] RTC: Remove the current_tm field
Date: Thu,  2 Aug 2012 18:04:13 +0200	[thread overview]
Message-ID: <1343923453-13026-11-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1343923453-13026-1-git-send-email-pbonzini@redhat.com>

This is not used anymore and only written to.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/mc146818rtc.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index a609f72..d63554f 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -61,7 +61,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;
@@ -524,7 +523,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);
 
@@ -566,7 +564,6 @@ static void rtc_update_time(RTCState *s)
     guest_sec = guest_nsec / NSEC_PER_SEC;
     gmtime_r(&guest_sec, &ret);
     rtc_set_cmos(s, &ret);
-    s->current_tm = ret;
 }
 
 static int update_in_progress(RTCState *s)
@@ -682,7 +679,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);
@@ -718,13 +714,7 @@ 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_UNUSED(7*4),
         VMSTATE_TIMER(periodic_timer, RTCState),
         VMSTATE_INT64(next_periodic_time, RTCState),
         VMSTATE_UNUSED(3*8),
-- 
1.7.10.4

  parent reply	other threads:[~2012-08-02 16:05 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-02 16:04 [Qemu-devel] [PATCH v3 00/10] Remove periodic wakeup from RTC timer Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 01/10] RTC: Remove the logic to update time format when DM bit changed Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 02/10] RTC: Rename rtc_timer_update Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 03/10] RTC: introduce RTC_CLOCK_RATE Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 04/10] RTC: Update interrupt state when interrupts are masked/unmasked Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 05/10] vmstate: add VMSTATE_TIMER_V Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 06/10] RTC: Update the RTC clock only when reading it Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 07/10] RTC: Add divider reset support Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 08/10] RTC: Do not fire timer periodically to catch next alarm Paolo Bonzini
2012-08-02 16:04 ` [Qemu-devel] [PATCH v3 09/10] RTC: Get and set time without going through s->current_tm Paolo Bonzini
2012-08-02 16:04 ` Paolo Bonzini [this message]
2012-09-10 17:05 ` [Qemu-devel] [PATCH v3 00/10] Remove periodic wakeup from RTC timer Paolo Bonzini
2012-09-10 23:00 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1343923453-13026-11-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=aliguori@linux.vnet.ibm.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=yang.z.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).