[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 15/28] qapi event: convert RTC_CHANGE
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 15/28] qapi event: convert RTC_CHANGE |
Date: |
Wed, 30 Apr 2014 21:26:49 -0700 |
Signed-off-by: Wenchao Xia <address@hidden>
---
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 <libfdt.h>
@@ -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
- [Qemu-devel] [PATCH V5 07/28] qapi event: convert SHUTDOWN, (continued)
- [Qemu-devel] [PATCH V5 07/28] qapi event: convert SHUTDOWN, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 09/28] qapi event: convert RESET, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 08/28] qapi event: convert POWERDOWN, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 10/28] qapi event: convert STOP, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 11/28] qapi event: convert RESUME, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 12/28] qapi event: convert SUSPEND, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 13/28] qapi event: convert SUSPEND_DISK, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 14/28] qapi event: convert WAKEUP, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 15/28] qapi event: convert RTC_CHANGE,
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 16/28] qapi event: convert WATCHDOG, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 18/28] qapi event: convert DEVICE_TRAY_MOVED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 19/28] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 21/28] qapi event: convert other BLOCK_JOB events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 22/28] qapi event: convert NIC_RX_FILTER_CHANGED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 23/28] qapi event: convert VNC events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 24/28] qapi event: convert SPICE events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 25/28] qapi event: convert BALLOON_CHANGE, Wenchao Xia, 2014/05/01