From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws
Subject: [Qemu-devel] [PULL 09/43] qapi: add event helper functions
Date: Mon, 23 Jun 2014 12:36:09 -0400 [thread overview]
Message-ID: <1403541403-16468-10-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com>
From: Wenchao Xia <wenchaoqemu@gmail.com>
This file holds some functions that do not need to be generated.
Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
include/qapi/qmp-event.h | 27 ++++++++++++++++++
qapi/Makefile.objs | 1 +
qapi/qmp-event.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 102 insertions(+)
create mode 100644 include/qapi/qmp-event.h
create mode 100644 qapi/qmp-event.c
diff --git a/include/qapi/qmp-event.h b/include/qapi/qmp-event.h
new file mode 100644
index 0000000..8a8ffb5
--- /dev/null
+++ b/include/qapi/qmp-event.h
@@ -0,0 +1,27 @@
+/*
+ * QMP Event related
+ *
+ * Copyright (c) 2014 Wenchao Xia
+ *
+ * Authors:
+ * Wenchao Xia <wenchaoqemu@gmail.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#ifndef QMP_EVENT_H
+#define QMP_EVENT_H
+
+#include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
+
+typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp);
+
+void qmp_event_set_func_emit(QMPEventFuncEmit emit);
+
+QMPEventFuncEmit qmp_event_get_func_emit(void);
+
+QDict *qmp_event_build_dict(const char *event_name);
+#endif
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
index 1f9c973..d14b769 100644
--- a/qapi/Makefile.objs
+++ b/qapi/Makefile.objs
@@ -3,3 +3,4 @@ util-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
util-obj-y += string-input-visitor.o string-output-visitor.o
util-obj-y += opts-visitor.o
+util-obj-y += qmp-event.o
diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
new file mode 100644
index 0000000..0d1ce0b
--- /dev/null
+++ b/qapi/qmp-event.c
@@ -0,0 +1,74 @@
+/*
+ * QMP Event related
+ *
+ * Copyright (c) 2014 Wenchao Xia
+ *
+ * Authors:
+ * Wenchao Xia <wenchaoqemu@gmail.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#include <inttypes.h>
+
+#include "qemu-common.h"
+#include "qapi/qmp-event.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qjson.h"
+
+#ifdef _WIN32
+#include "sysemu/os-win32.h"
+#endif
+
+#ifdef CONFIG_POSIX
+#include "sysemu/os-posix.h"
+#endif
+
+static QMPEventFuncEmit qmp_emit;
+
+void qmp_event_set_func_emit(QMPEventFuncEmit emit)
+{
+ qmp_emit = emit;
+}
+
+QMPEventFuncEmit qmp_event_get_func_emit(void)
+{
+ return qmp_emit;
+}
+
+static void timestamp_put(QDict *qdict)
+{
+ int err;
+ QObject *obj;
+ qemu_timeval tv;
+ int64_t sec, usec;
+
+ err = qemu_gettimeofday(&tv);
+ if (err < 0) {
+ /* Put -1 to indicate failure of getting host time */
+ sec = -1;
+ usec = -1;
+ } else {
+ sec = tv.tv_sec;
+ usec = tv.tv_usec;
+ }
+
+ obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", "
+ "'microseconds': %" PRId64 " }",
+ sec, usec);
+ qdict_put_obj(qdict, "timestamp", obj);
+}
+
+/*
+ * Build a QDict, then fill event name and time stamp, caller should free the
+ * QDict after usage.
+ */
+QDict *qmp_event_build_dict(const char *event_name)
+{
+ QDict *dict = qdict_new();
+ qdict_put(dict, "event", qstring_from_str(event_name));
+ timestamp_put(dict);
+ return dict;
+}
--
1.9.3
next prev parent reply other threads:[~2014-06-23 16:37 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 16:36 [Qemu-devel] [PULL 00/43] QMP queue Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 01/43] fpu: softfloat: drop INLINE macro Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 02/43] audio: fmopl: " Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 03/43] qapi: fix coding style in parameters list Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type() Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 05/43] qapi: Suppress unwanted space between type and identifier Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 06/43] json-lexer: fix escaped backslash in single-quoted string Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 07/43] os-posix: include sys/time.h Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 08/43] qapi: Add includes from qapi/ as dependencies Luiz Capitulino
2014-06-23 16:36 ` Luiz Capitulino [this message]
2014-06-23 16:36 ` [Qemu-devel] [PULL 10/43] qapi script: add event support Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 11/43] test: add test cases for qapi event Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 12/43] qapi: adjust existing defines Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 13/43] monitor: add an implemention of qapi event emit method Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 14/43] qapi: add new schema file qapi-event.json Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 15/43] qapi event: convert SHUTDOWN Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 17/43] qapi event: convert RESET Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 18/43] qapi event: convert STOP Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 19/43] qapi event: convert RESUME Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 20/43] qapi event: convert SUSPEND Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 22/43] qapi event: convert WAKEUP Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 23/43] qapi event: convert RTC_CHANGE Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 26/43] qapi event: convert DEVICE_TRAY_MOVED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 27/43] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 28/43] qapi event: convert BLOCK_IMAGE_CORRUPTED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 30/43] qapi event: convert NIC_RX_FILTER_CHANGED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 31/43] qapi event: convert VNC events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 32/43] qapi event: convert SPICE events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 33/43] qmp: convert ACPI_DEVICE_OST event Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 35/43] qapi event: convert GUEST_PANICKED Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 36/43] qapi event: convert QUORUM events Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 37/43] qapi event: clean up Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 38/43] qemu-char: introduce qemu_chr_alloc Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 41/43] qemu-char: make writes thread-safe Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex Luiz Capitulino
2014-06-23 16:36 ` [Qemu-devel] [PULL 43/43] monitor: protect event emission Luiz Capitulino
2014-06-23 16:39 ` [Qemu-devel] [PULL 00/43] QMP queue Luiz Capitulino
2014-06-23 16:40 ` Paolo Bonzini
2014-06-23 17:15 ` Eric Blake
2014-06-24 13:15 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403541403-16468-10-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).