qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org, armbru@redhat.com, aliguori@us.ibm.com,
	avi@redhat.com
Subject: [Qemu-devel] [PATCH 08/11] QMP: Asynchronous messages enable/disable support
Date: Thu, 21 Jan 2010 19:09:37 -0200	[thread overview]
Message-ID: <1264108180-3666-9-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1264108180-3666-1-git-send-email-lcapitulino@redhat.com>

This commit disables asynchronous messages by default and
introduces two new QMP commands: async_msg_enable and
async_msg_disable.

Each QMP Monitor has its own set of asynchronous messages,
so for example, if QEMU is run with two QMP Monitors async
messages setup in one of them doesn't affect the other.

To implement this design a bitmap is introduced to the
Monitor struct, each async message is represented by one bit.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 qemu-monitor.hx |   30 ++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletions(-)

diff --git a/monitor.c b/monitor.c
index 61c0273..321bc3a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -108,11 +108,14 @@ typedef enum QMPMode {
     QMODE_HANDSHAKE,
 } QMPMode;
 
+#define EVENTS_BITMAP_SIZE (QEVENT_MAX / 8)
+
 typedef struct MonitorControl {
     QObject *id;
     QMPMode mode;
     int print_enabled;
     JSONMessageParser parser;
+    uint8_t events_bitmap[EVENTS_BITMAP_SIZE];
 } MonitorControl;
 
 struct Monitor {
@@ -318,6 +321,23 @@ static void monitor_protocol_emitter(Monitor *mon, QObject *data)
     QDECREF(qmp);
 }
 
+static void qevent_set(const Monitor *mon, int64_t event)
+{
+    assert(event >= 0 && event < QEVENT_MAX);
+    mon->mc->events_bitmap[event / 8] |= (1 << (event % 8));
+}
+
+static void qevent_unset(const Monitor *mon, int64_t event)
+{
+    assert(event >= 0 && event < QEVENT_MAX);
+    mon->mc->events_bitmap[event / 8] &= ~(1 << (event % 8));
+}
+
+static int qevent_enabled(const Monitor *mon, int64_t event)
+{
+    return (mon->mc->events_bitmap[event / 8] & (1 << (event % 8)));
+}
+
 static void timestamp_put(QDict *qdict)
 {
     int err;
@@ -389,7 +409,8 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
     }
 
     QLIST_FOREACH(mon, &mon_list, entry) {
-        if (monitor_ctrl_mode(mon)) {
+        if (monitor_ctrl_mode(mon) &&
+            qevent_enabled(mon, event)) {
             monitor_json_emitter(mon, QOBJECT(qmp));
         }
     }
@@ -465,6 +486,32 @@ static void do_commit(Monitor *mon, const QDict *qdict)
     }
 }
 
+static void qevent_set_value(Monitor *mon, const QDict *qdict, int value)
+{
+    int i;
+    const char *name = qdict_get_str(qdict, "name");
+
+    for (i = 0; monitor_events_names[i].name != NULL; i++) {
+        if (!strcmp(monitor_events_names[i].name, name)) {
+            return (value ? qevent_set(mon, i) : qevent_unset(mon, i));
+        }
+    }
+
+    qemu_error_new(QERR_ASYNC_MSG_NOT_FOUND, name);
+}
+
+static void do_async_msg_enable(Monitor *mon, const QDict *qdict,
+                                QObject **ret_data)
+{
+    qevent_set_value(mon, qdict, 1);
+}
+
+static void do_async_msg_disable(Monitor *mon, const QDict *qdict,
+                                 QObject **ret_data)
+{
+    qevent_set_value(mon, qdict, 0);
+}
+
 static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     const mon_cmd_t *cmd;
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index eebea09..0f3dfde 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -1077,6 +1077,36 @@ STEXI
 Switch QMP to @var{mode}
 ETEXI
 
+    {
+        .name       = "async_msg_enable",
+        .args_type  = "name:s",
+        .params     = "async_msg_enable name",
+        .help       = "enable an asynchronous message",
+        .flags      = HANDLER_HANDSHAKE_ONLY,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_async_msg_enable,
+    },
+
+STEXI
+@item async_msg_enable @var{name}
+Enable the asynchronous message @var{name}
+ETEXI
+
+    {
+        .name       = "async_msg_disable",
+        .args_type  = "name:s",
+        .params     = "async_msg_disable name",
+        .help       = "disable an asynchronous message",
+        .flags      = HANDLER_HANDSHAKE_ONLY,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_async_msg_disable,
+    },
+
+STEXI
+@item async_msg_disable @var{name}
+Disable the asynchronous message @var{name}
+ETEXI
+
 STEXI
 @end table
 ETEXI
-- 
1.6.6

  parent reply	other threads:[~2010-01-21 21:10 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-21 21:09 [Qemu-devel] [RFC 00/11]: QMP feature negotiation support Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 01/11] QMP: Initial mode-oriented bits Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 02/11] QMP: Introduce 'query-qmp-mode' command Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 03/11] QError: Add QMP mode-oriented errors Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 04/11] QMP: Introduce qmp_switch_mode command Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 05/11] QMP: advertise asynchronous messages Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 06/11] QMP: Array-based async messages Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 07/11] QError: New QERR_ASYNC_MSG_NOT_FOUND Luiz Capitulino
2010-01-21 21:09 ` Luiz Capitulino [this message]
2010-01-22 18:05   ` [Qemu-devel] [PATCH 08/11] QMP: Asynchronous messages enable/disable support Anthony Liguori
2010-01-22 20:09     ` Luiz Capitulino
2010-01-22 23:14       ` Anthony Liguori
2010-01-25 14:29       ` Markus Armbruster
2010-01-25 14:33         ` Avi Kivity
2010-01-25 15:11           ` Luiz Capitulino
2010-01-24 10:34     ` Avi Kivity
2010-01-24 11:07       ` Jamie Lokier
2010-01-24 15:35         ` Anthony Liguori
2010-01-24 18:35           ` Jamie Lokier
2010-01-25 11:49             ` Luiz Capitulino
2010-01-25 14:15               ` Markus Armbruster
2010-01-25 14:22                 ` Luiz Capitulino
2010-01-24 14:04       ` Anthony Liguori
2010-01-24 14:17         ` Avi Kivity
2010-01-24 14:19           ` Anthony Liguori
2010-01-25 12:02             ` Luiz Capitulino
2010-01-24 10:36   ` [Qemu-devel] " Avi Kivity
2010-01-25 13:14     ` Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 09/11] Monitor: Introduce find_info_cmd() Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 10/11] QError: New QERR_QMP_INVALID_MODE_COMMAND Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 11/11] QMP: Enable feature negotiation support Luiz Capitulino
2010-01-22 10:21 ` [Qemu-devel] [RFC 00/11]: QMP " Markus Armbruster
2010-01-22 12:09   ` Luiz Capitulino
2010-01-22 14:00     ` Markus Armbruster
2010-01-22 18:00 ` Anthony Liguori
2010-01-25 14:33   ` Markus Armbruster
2010-01-26 11:53     ` Luiz Capitulino
2010-01-26 12:57       ` Jamie Lokier
2010-01-26 13:45         ` Luiz Capitulino
2010-01-26 14:29         ` Daniel P. Berrange
2010-01-26 15:57           ` Jamie Lokier
2010-01-26 16:21             ` Luiz Capitulino

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=1264108180-3666-9-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=avi@redhat.com \
    --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).