From patchwork Fri Feb 6 03:55:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 437005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 385F214028F for ; Fri, 6 Feb 2015 14:56:32 +1100 (AEDT) Received: from localhost ([::1]:46558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJa1u-0003kz-Fd for incoming@patchwork.ozlabs.org; Thu, 05 Feb 2015 22:56:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJa16-0002Lh-Ub for qemu-devel@nongnu.org; Thu, 05 Feb 2015 22:55:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJa10-000385-Q3 for qemu-devel@nongnu.org; Thu, 05 Feb 2015 22:55:40 -0500 Received: from ozlabs.org ([103.22.144.67]:40700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJa10-00037j-Eg; Thu, 05 Feb 2015 22:55:34 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 469081402D5; Fri, 6 Feb 2015 14:55:30 +1100 (AEDT) From: David Gibson To: agraf@sue.de, aik@ozlabs.ru, mdroth@us.ibm.com Date: Fri, 6 Feb 2015 14:55:53 +1100 Message-Id: <1423194953-7673-10-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1423194953-7673-1-git-send-email-david@gibson.dropbear.id.au> References: <1423194953-7673-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: amit.shah@redhat.com, pbonzini@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCHv3 9/9] pseries: Export RTC time via QOM 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 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 --- hw/ppc/spapr.c | 3 +++ hw/ppc/spapr_rtc.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2264802..e6623e1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -999,6 +999,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 = {