@@ -57,6 +57,7 @@
#include "qapi/qmp/qjson.h"
#include "qapi/qmp/json-streamer.h"
#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp-event.h"
#include <qom/object_interfaces.h>
#include "qemu/osdep.h"
#include "cpu.h"
@@ -76,6 +77,8 @@
#endif
#include "hw/lm32/lm32_pic.h"
+#include "qapi-event.h"
+
//#define DEBUG
//#define DEBUG_COMPLETION
@@ -632,6 +635,16 @@ monitor_protocol_event_throttle(MonitorEvent event,
evstate->data = NULL;
}
+static void monitor_event_emit(int event_kind, QDict *d, Error **errp)
+{
+ Monitor *mon;
+
+ QLIST_FOREACH(mon, &mon_list, entry) {
+ if (monitor_ctrl_mode(mon) && qmp_cmd_mode(mon)) {
+ monitor_json_emitter(mon, QOBJECT(d));
+ }
+ }
+}
/* Global, one-time initializer to configure the rate limiting
* and initialize state */
@@ -644,6 +657,8 @@ static void monitor_protocol_event_init(void)
/* limit the rate of quorum events to avoid hammering the management */
monitor_protocol_event_throttle(QEVENT_QUORUM_REPORT_BAD, 1000);
monitor_protocol_event_throttle(QEVENT_QUORUM_FAILURE, 1000);
+
+ qmp_event_set_func_emit(monitor_event_emit);
}
/**
@@ -4686,3 +4686,16 @@
'btn' : 'InputBtnEvent',
'rel' : 'InputMoveEvent',
'abs' : 'InputMoveEvent' } }
+
+##
+# @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: 2.1
+##
+{ 'event': 'RTC_CHANGE',
+ 'data': { 'offset' : 'int' } }
@@ -117,6 +117,7 @@ int main(int argc, char **argv)
#include "ui/qemu-spice.h"
#include "qapi/string-input-visitor.h"
#include "qom/object_interfaces.h"
+#include "qapi-event.h"
#define DEFAULT_RAM_SIZE 128
@@ -723,11 +724,7 @@ int qemu_timedate_diff(struct tm *tm)
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);
+ qapi_event_send_rtc_change(qemu_timedate_diff(tm), NULL);
}
static void configure_rtc_date_offset(const char *startdate, int legacy)
This is just an example of how to use qapi event API, and it bypassed the event throttle queue. A complete convert should be first define all events in qapi-schema.json, use qapi event types in monitor functions, then change caller one by one. Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com> --- monitor.c | 15 +++++++++++++++ qapi-schema.json | 13 +++++++++++++ vl.c | 7 ++----- 3 files changed, 30 insertions(+), 5 deletions(-)