From patchwork Sun Mar 8 08:44:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 447699 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 9230A1401DE for ; Sun, 8 Mar 2015 19:52:30 +1100 (AEDT) Received: from localhost ([::1]:37906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUWwm-0001Eh-K2 for incoming@patchwork.ozlabs.org; Sun, 08 Mar 2015 04:52:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUWpf-0004Y4-Q5 for qemu-devel@nongnu.org; Sun, 08 Mar 2015 04:45:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YUWpZ-0004eQ-Ka for qemu-devel@nongnu.org; Sun, 08 Mar 2015 04:45:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33776 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUWpZ-0004bw-EE; Sun, 08 Mar 2015 04:45:01 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 73654ACF2; Sun, 8 Mar 2015 08:45:00 +0000 (UTC) From: Alexander Graf To: qemu-ppc@nongnu.org Date: Sun, 8 Mar 2015 09:44:33 +0100 Message-Id: <1425804297-53727-15-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1425804297-53727-1-git-send-email-agraf@suse.de> References: <1425804297-53727-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 14/38] 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 From: David Gibson 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 Signed-off-by: Alexander Graf --- 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 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 = {