diff options
| -rw-r--r-- | hw/ppc/spapr_events.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_rtc.c | 13 | ||||
| -rw-r--r-- | include/hw/ppc/spapr.h | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 1b6157dec4..80c02660f7 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -246,7 +246,7 @@ static void spapr_powerdown_req(Notifier *n, void *opaque) maina->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_MAINA); maina->hdr.section_length = cpu_to_be16(sizeof(*maina)); /* FIXME: section version, subtype and creator id? */ - qemu_get_timedate(&tm, spapr->rtc_offset); + spapr_rtc_read(spapr, &tm, NULL); year = tm.tm_year + 1900; maina->creation_date = cpu_to_be32((to_bcd(year / 100) << 24) | (to_bcd(year % 100) << 16) diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 13eeab8745..793368fae8 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -29,19 +29,28 @@ #include "hw/ppc/spapr.h" #include "qapi-event.h" +void spapr_rtc_read(sPAPREnvironment *spapr, struct tm *tm, uint32_t *ns) +{ + qemu_get_timedate(tm, spapr->rtc_offset); + if (ns) { + *ns = 0; /* we don't do nanoseconds, yet */ + } +} + static void rtas_get_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr, uint32_t token, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { struct tm tm; + uint32_t ns; if ((nargs != 0) || (nret != 8)) { rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); return; } - qemu_get_timedate(&tm, spapr->rtc_offset); + spapr_rtc_read(spapr, &tm, &ns); rtas_st(rets, 0, RTAS_OUT_SUCCESS); rtas_st(rets, 1, tm.tm_year + 1900); @@ -50,7 +59,7 @@ static void rtas_get_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr, rtas_st(rets, 4, tm.tm_hour); rtas_st(rets, 5, tm.tm_min); rtas_st(rets, 6, tm.tm_sec); - rtas_st(rets, 7, 0); /* we don't do nanoseconds */ + rtas_st(rets, 7, ns); } static void rtas_set_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr, diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e43339d33a..0fd49128c6 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -481,5 +481,6 @@ int spapr_dma_dt(void *fdt, int node_off, const char *propname, int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname, sPAPRTCETable *tcet); void spapr_rtc_init(void); +void spapr_rtc_read(sPAPREnvironment *spapr, struct tm *tm, uint32_t *ns); #endif /* !defined (__HW_SPAPR_H__) */ |