[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/10] RTC: Get and set time without going throug
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 09/10] RTC: Get and set time without going through s->current_tm |
Date: |
Thu, 2 Aug 2012 18:04:12 +0200 |
This patch makes rtc_set_time and rtc_set_cmos work without reading
s->current_tm. In the case of rtc_set_time I introduce a new
function that retrieves the time and stores into a given struct tm
(not hard-coded to s->current_tm). In the case of rtc_set_cmos, the
current time is similarly taken from a struct tm rather than
s->current_tm.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/mc146818rtc.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 9d530a8..a609f72 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -86,7 +86,7 @@ typedef struct RTCState {
static void rtc_set_time(RTCState *s);
static void rtc_update_time(RTCState *s);
-static void rtc_set_cmos(RTCState *s);
+static void rtc_set_cmos(RTCState *s, const struct tm *tm);
static inline int rtc_from_bcd(RTCState *s, int a);
static uint64_t get_next_alarm(RTCState *s);
@@ -502,10 +502,8 @@ static inline int rtc_from_bcd(RTCState *s, int a)
}
}
-static void rtc_set_time(RTCState *s)
+static void rtc_get_time(RTCState *s, struct tm *tm)
{
- struct tm *tm = &s->current_tm;
-
tm->tm_sec = rtc_from_bcd(s, s->cmos_data[RTC_SECONDS]);
tm->tm_min = rtc_from_bcd(s, s->cmos_data[RTC_MINUTES]);
tm->tm_hour = rtc_from_bcd(s, s->cmos_data[RTC_HOURS] & 0x7f);
@@ -519,16 +517,22 @@ static void rtc_set_time(RTCState *s)
tm->tm_mday = rtc_from_bcd(s, s->cmos_data[RTC_DAY_OF_MONTH]);
tm->tm_mon = rtc_from_bcd(s, s->cmos_data[RTC_MONTH]) - 1;
tm->tm_year = rtc_from_bcd(s, s->cmos_data[RTC_YEAR]) + s->base_year -
1900;
+}
+
+static void rtc_set_time(RTCState *s)
+{
+ struct tm tm;
- s->base_rtc = mktimegm(tm);
+ rtc_get_time(s, &tm);
+ s->current_tm = tm;
+ s->base_rtc = mktimegm(&tm);
s->last_update = qemu_get_clock_ns(rtc_clock);
- rtc_change_mon_event(tm);
+ rtc_change_mon_event(&tm);
}
-static void rtc_set_cmos(RTCState *s)
+static void rtc_set_cmos(RTCState *s, const struct tm *tm)
{
- const struct tm *tm = &s->current_tm;
int year;
s->cmos_data[RTC_SECONDS] = rtc_to_bcd(s, tm->tm_sec);
@@ -561,8 +565,8 @@ static void rtc_update_time(RTCState *s)
guest_nsec = get_guest_rtc_ns(s);
guest_sec = guest_nsec / NSEC_PER_SEC;
gmtime_r(&guest_sec, &ret);
+ rtc_set_cmos(s, &ret);
s->current_tm = ret;
- rtc_set_cmos(s);
}
static int update_in_progress(RTCState *s)
@@ -677,8 +681,8 @@ static void rtc_set_date_from_host(ISADevice *dev)
s->offset = 0;
/* set the CMOS date */
+ rtc_set_cmos(s, &tm);
s->current_tm = tm;
- rtc_set_cmos(s);
val = rtc_to_bcd(s, (tm.tm_year / 100) + 19);
rtc_set_memory(dev, REG_IBM_CENTURY_BYTE, val);
@@ -789,15 +793,17 @@ static void rtc_get_date(Object *obj, Visitor *v, void
*opaque,
{
ISADevice *isa = ISA_DEVICE(obj);
RTCState *s = DO_UPCAST(RTCState, dev, isa);
+ struct tm current_tm;
rtc_update_time(s);
+ rtc_get_time(s, ¤t_tm);
visit_start_struct(v, NULL, "struct tm", name, 0, errp);
- visit_type_int32(v, &s->current_tm.tm_year, "tm_year", errp);
- visit_type_int32(v, &s->current_tm.tm_mon, "tm_mon", errp);
- visit_type_int32(v, &s->current_tm.tm_mday, "tm_mday", errp);
- visit_type_int32(v, &s->current_tm.tm_hour, "tm_hour", errp);
- visit_type_int32(v, &s->current_tm.tm_min, "tm_min", errp);
- visit_type_int32(v, &s->current_tm.tm_sec, "tm_sec", errp);
+ visit_type_int32(v, ¤t_tm.tm_year, "tm_year", errp);
+ visit_type_int32(v, ¤t_tm.tm_mon, "tm_mon", errp);
+ visit_type_int32(v, ¤t_tm.tm_mday, "tm_mday", errp);
+ visit_type_int32(v, ¤t_tm.tm_hour, "tm_hour", errp);
+ visit_type_int32(v, ¤t_tm.tm_min, "tm_min", errp);
+ visit_type_int32(v, ¤t_tm.tm_sec, "tm_sec", errp);
visit_end_struct(v, errp);
}
--
1.7.10.4
- [Qemu-devel] [PATCH v3 00/10] Remove periodic wakeup from RTC timer, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 01/10] RTC: Remove the logic to update time format when DM bit changed, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 04/10] RTC: Update interrupt state when interrupts are masked/unmasked, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 02/10] RTC: Rename rtc_timer_update, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 03/10] RTC: introduce RTC_CLOCK_RATE, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 05/10] vmstate: add VMSTATE_TIMER_V, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 06/10] RTC: Update the RTC clock only when reading it, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 08/10] RTC: Do not fire timer periodically to catch next alarm, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 07/10] RTC: Add divider reset support, Paolo Bonzini, 2012/08/02
- [Qemu-devel] [PATCH v3 09/10] RTC: Get and set time without going through s->current_tm,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 10/10] RTC: Remove the current_tm field, Paolo Bonzini, 2012/08/02