From patchwork Thu Jun 19 19:39:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 362003 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 394E0140086 for ; Fri, 20 Jun 2014 06:41:40 +1000 (EST) Received: from localhost ([::1]:37521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiIt-00036S-4A for incoming@patchwork.ozlabs.org; Thu, 19 Jun 2014 15:47:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiC5-0004m6-44 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:40:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxiBy-0007pd-Vi for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:40:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiBy-0007p5-O0 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:40:14 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5JJeA5q011066 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Jun 2014 15:40:11 -0400 Received: from localhost (ovpn-113-20.phx2.redhat.com [10.3.113.20]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5JJe97X014746; Thu, 19 Jun 2014 15:40:10 -0400 From: Luiz Capitulino To: peter.maydell@linaro.org Date: Thu, 19 Jun 2014 15:39:33 -0400 Message-Id: <1403206792-15387-22-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403206792-15387-1-git-send-email-lcapitulino@redhat.com> References: <1403206792-15387-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 21/40] qapi event: convert RTC_CHANGE 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: Wenchao Xia This patch also eliminates build time warning caused by no caller of monitor_qapi_event_throttle(). Signed-off-by: Wenchao Xia Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- docs/qmp/qmp-events.txt | 16 ---------------- hw/ppc/spapr_rtas.c | 3 ++- hw/timer/mc146818rtc.c | 3 ++- include/sysemu/sysemu.h | 2 -- monitor.c | 4 +++- qapi-event.json | 13 +++++++++++++ vl.c | 9 --------- 7 files changed, 20 insertions(+), 30 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 3d82db4..8cad3e7 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -264,22 +264,6 @@ Example: "data": { "node-name": "1.raw", "sector-num": 345435, "sector-count": 5 }, "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } -RTC_CHANGE ----------- - -Emitted when the guest changes the RTC time. - -Data: - -- "offset": Offset between base RTC clock (as specified by -rtc base), and -new RTC clock value (json-number) - -Example: - -{ "event": "RTC_CHANGE", - "data": { "offset": 78 }, - "timestamp": { "seconds": 1267020223, "microseconds": 435656 } } - SPICE_CONNECTED, SPICE_DISCONNECTED ----------------------------------- diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index ea4a2b2..8d08539 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -32,6 +32,7 @@ #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "qapi-event.h" #include @@ -93,7 +94,7 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr, tm.tm_sec = rtas_ld(args, 5); /* Just generate a monitor event for the change */ - rtc_change_mon_event(&tm); + qapi_event_send_rtc_change(qemu_timedate_diff(&tm), &error_abort); spapr->rtc_offset = qemu_timedate_diff(&tm); rtas_st(rets, 0, RTAS_OUT_SUCCESS); diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 1201f90..05002bf 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -26,6 +26,7 @@ #include "sysemu/sysemu.h" #include "hw/timer/mc146818rtc.h" #include "qapi/visitor.h" +#include "qapi-event.h" #ifdef TARGET_I386 #include "hw/i386/apic.h" @@ -530,7 +531,7 @@ static void rtc_set_time(RTCState *s) s->base_rtc = mktimegm(&tm); s->last_update = qemu_clock_get_ns(rtc_clock); - rtc_change_mon_event(&tm); + qapi_event_send_rtc_change(qemu_timedate_diff(&tm), &error_abort); } static void rtc_set_cmos(RTCState *s, const struct tm *tm) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index ba5c7f8..0046b27 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -189,8 +189,6 @@ void do_usb_add(Monitor *mon, const QDict *qdict); void do_usb_del(Monitor *mon, const QDict *qdict); void usb_info(Monitor *mon, const QDict *qdict); -void rtc_change_mon_event(struct tm *tm); - void add_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix); char *get_boot_devices_list(size_t *size, bool ignore_suffixes); diff --git a/monitor.c b/monitor.c index 2e36fed..cfaed60 100644 --- a/monitor.c +++ b/monitor.c @@ -613,6 +613,9 @@ monitor_qapi_event_throttle(QAPIEvent event, int64_t rate) static void monitor_qapi_event_init(void) { + /* Limit guest-triggerable events to 1 per second */ + monitor_qapi_event_throttle(QAPI_EVENT_RTC_CHANGE, 1000); + qmp_event_set_func_emit(monitor_qapi_event_queue); } @@ -739,7 +742,6 @@ monitor_protocol_event_throttle(MonitorEvent event, static void monitor_protocol_event_init(void) { /* Limit RTC & BALLOON events to 1 per second */ - monitor_protocol_event_throttle(QEVENT_RTC_CHANGE, 1000); monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000); monitor_protocol_event_throttle(QEVENT_WATCHDOG, 1000); /* limit the rate of quorum events to avoid hammering the management */ diff --git a/qapi-event.json b/qapi-event.json index 807a6f5..e6cfafa 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -78,3 +78,16 @@ # Since: 1.1 ## { 'event': 'WAKEUP' } + +## +# @RTC_CHANGE +# +# Emitted when the guest changes the RTC time. +# +# @offset: offset between base RTC clock (as specified by -rtc base), and +# new RTC clock value +# +# Since: 0.13.0 +## +{ 'event': 'RTC_CHANGE', + 'data': { 'offset': 'int' } } diff --git a/vl.c b/vl.c index bcda808..198c77a 100644 --- a/vl.c +++ b/vl.c @@ -727,15 +727,6 @@ int qemu_timedate_diff(struct tm *tm) return seconds - time(NULL); } -void rtc_change_mon_event(struct tm *tm) -{ - QObject *data; - - data = qobject_from_jsonf("{ 'offset': %d }", qemu_timedate_diff(tm)); - monitor_protocol_event(QEVENT_RTC_CHANGE, data); - qobject_decref(data); -} - static void configure_rtc_date_offset(const char *startdate, int legacy) { time_t rtc_start_date;