From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibj-0001F4-5c for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfibZ-0002MJ-TV for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:27 -0400 Received: from mail-ig0-x22a.google.com ([2607:f8b0:4001:c05::22a]:53118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfibZ-0002MB-Ox for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:17 -0400 Received: by mail-ig0-f170.google.com with SMTP id uq10so159575igb.1 for ; Wed, 30 Apr 2014 21:28:17 -0700 (PDT) From: Wenchao Xia Date: Wed, 30 Apr 2014 21:26:49 -0700 Message-Id: <1398918422-3019-16-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V5 15/28] qapi event: convert RTC_CHANGE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Signed-off-by: Wenchao Xia --- hw/ppc/spapr_rtas.c | 3 ++- hw/timer/mc146818rtc.c | 3 ++- include/sysemu/sysemu.h | 2 -- vl.c | 9 --------- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 73860d0..d639b20 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), NULL); 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 8509309..eeeb91c 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), NULL); } 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/vl.c b/vl.c index 73b4725..ecea575 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; -- 1.7.1