diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2015-02-06 14:55:53 +1100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-03-09 15:00:00 +0100 |
| commit | 74e5ae284b1c8ac36a77e57ab9a49178173c666f (patch) | |
| tree | 74d6b60df603a5a86998f256c12eb2569fcd584c | |
| parent | 880ae7de5958a765699386777de0f3841d635e1d (diff) | |
| download | qemu-74e5ae284b1c8ac36a77e57ab9a49178173c666f.zip qemu-74e5ae284b1c8ac36a77e57ab9a49178173c666f.tar.gz qemu-74e5ae284b1c8ac36a77e57ab9a49178173c666f.tar.bz2 | |
pseries: Export RTC time via QOM
On x86, the guest's RTC can be read with QMP, either from the RTC device's
"date" property or via the "rtc-time" property on the machine (which is an
alias to the former). This is set up in the mc146818rtc driver, and
doesn't work on other targets.
This patch adds a similar "date" property to the pseries machine's RTAS RTC
and adds a compatible alias to the machine.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/ppc/spapr.c | 3 | ||||
| -rw-r--r-- | hw/ppc/spapr_rtc.c | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6e8248d..b39073b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1000,6 +1000,9 @@ static void spapr_rtc_create(sPAPREnvironment *spapr) qdev_init_nofail(dev); spapr->rtc = dev; + + object_property_add_alias(qdev_get_machine(), "rtc-time", + OBJECT(spapr->rtc), "date", NULL); } /* Returns whether we want to use VGA or not */ diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 5ad0823..83eb7c1 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -152,6 +152,11 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } +static void spapr_rtc_qom_date(Object *obj, struct tm *current_tm, Error **errp) +{ + spapr_rtc_read(DEVICE(obj), current_tm, NULL); +} + static void spapr_rtc_realize(DeviceState *dev, Error **errp) { sPAPRRTCState *rtc = SPAPR_RTC(dev); @@ -165,6 +170,8 @@ static void spapr_rtc_realize(DeviceState *dev, Error **errp) host_s = mktimegm(&tm); rtc_ns = qemu_clock_get_ns(rtc_clock); rtc->ns_offset = host_s * NSEC_PER_SEC - rtc_ns; + + object_property_add_tm(OBJECT(rtc), "date", spapr_rtc_qom_date, NULL); } static const VMStateDescription vmstate_spapr_rtc = { |