qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 18/18] QMP: Introduce qmp_call_cmd()
Date: Thu, 16 Sep 2010 17:21:04 -0300	[thread overview]
Message-ID: <1284668464-15981-19-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com>

Calls a QObject handler and emits the QMP response, also drops
monitor_call_handler() which is now unused.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/monitor.c b/monitor.c
index c332e06..1da65ab 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3877,29 +3877,6 @@ static void handler_audit(Monitor *mon, const mon_cmd_t *cmd, int ret)
     }
 }
 
-static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd,
-                                 const QDict *params)
-{
-    int ret;
-    QObject *data = NULL;
-
-    mon_print_count_init(mon);
-
-    ret = cmd->mhandler.cmd_new(mon, params, &data);
-    handler_audit(mon, cmd, ret);
-
-    if (monitor_ctrl_mode(mon)) {
-        /* Monitor Protocol */
-        monitor_protocol_emitter(mon, data);
-    } else {
-        /* User Protocol */
-         if (data)
-            cmd->user_print(mon, data);
-    }
-
-    qobject_decref(data);
-}
-
 static void handle_user_command(Monitor *mon, const char *cmdline)
 {
     QDict *qdict;
@@ -4430,6 +4407,20 @@ static void qmp_call_query_cmd(Monitor *mon, const mon_cmd_t *cmd)
     }
 }
 
+static void qmp_call_cmd(Monitor *mon, const mon_cmd_t *cmd,
+                         const QDict *params)
+{
+    int ret;
+    QObject *data = NULL;
+
+    mon_print_count_init(mon);
+
+    ret = cmd->mhandler.cmd_new(mon, params, &data);
+    handler_audit(mon, cmd, ret);
+    monitor_protocol_emitter(mon, data);
+    qobject_decref(data);
+}
+
 static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
 {
     int err;
@@ -4497,7 +4488,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
             goto err_out;
         }
     } else {
-        monitor_call_handler(mon, cmd, args);
+        qmp_call_cmd(mon, cmd, args);
     }
 
     goto out;
-- 
1.7.3.rc2.dirty

  parent reply	other threads:[~2010-09-16 20:21 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-16 20:20 [Qemu-devel] [PATCH 00/18] Monitor: split HMP and QMP dispatch tables Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 01/18] Monitor: Introduce find_dispatch_table() Luiz Capitulino
2010-09-29  9:29   ` Markus Armbruster
2010-09-16 20:20 ` [Qemu-devel] [PATCH 02/18] QMP: handle_qmp_command(): Move 'cmd' sanity check Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 03/18] QMP: Don't use do_info() Luiz Capitulino
2010-09-29 11:13   ` Markus Armbruster
2010-09-16 20:20 ` [Qemu-devel] [PATCH 04/18] Monitor: Drop QMP bits from do_info() Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 05/18] Monitor: Drop is_async_return() Luiz Capitulino
2010-09-29 11:21   ` Markus Armbruster
2010-09-29 13:28     ` Luiz Capitulino
2010-09-29 15:11       ` Anthony Liguori
2010-09-29 15:11       ` Anthony Liguori
2010-09-16 20:20 ` [Qemu-devel] [PATCH 06/18] Monitor: Convert do_info() back to HMP Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 07/18] Monitor: Introduce the qemu-monitor-qmp.hx file Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 08/18] QMP: Introduce qmp_find_cmd() Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 09/18] QMP: Introduce command dispatch table Luiz Capitulino
2010-09-29 11:31   ` Markus Armbruster
2010-09-29 13:47     ` Luiz Capitulino
2010-09-29 14:23       ` Markus Armbruster
2010-09-16 20:20 ` [Qemu-devel] [PATCH 10/18] QMP: Introduce query commands " Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 11/18] QMP: Simplify do_info_commands() Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 12/18] QMP: Small cleanup in handle_qmp_command() Luiz Capitulino
2010-09-16 20:20 ` [Qemu-devel] [PATCH 13/18] Monitor: Drop QMP info from the qemu-monitor.hx file Luiz Capitulino
2010-09-16 20:21 ` [Qemu-devel] [PATCH 14/18] Monitor: Drop monitor_cmd_user_only() Luiz Capitulino
2010-09-16 20:21 ` [Qemu-devel] [PATCH 15/18] Monitor: Rename monitor_handler_ported() Luiz Capitulino
2010-09-16 20:21 ` [Qemu-devel] [PATCH 16/18] Monitor: Rename monitor_handler_is_async() Luiz Capitulino
2010-09-16 20:21 ` [Qemu-devel] [PATCH 17/18] Monitor: Directly call QObject handlers Luiz Capitulino
2010-09-16 20:21 ` Luiz Capitulino [this message]
2010-09-21 12:56 ` [Qemu-devel] [PATCH 00/18] Monitor: split HMP and QMP dispatch tables Anthony Liguori
2010-09-29 11:41   ` Markus Armbruster

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=1284668464-15981-19-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@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).