commit de79ba6f53fa78a6132a67c7ff134014dc8479e7
author Luiz Capitulino <lcapitulino@redhat.com> Thu Sep 16 11:06:11 2010 -0300
committer Luiz Capitulino <lcapitulino@redhat.com> Fri Oct 01 10:20:07 2010 -0300
tree 9224a31a3a31ad095fccfa72ca35e1d4910463b6
parent 4903de0cebb6306e8c660dc0ce3e66fe3b5c35f9

Monitor: Directly call QObject handlers

This avoids handle_user_command() calling monitor_call_handler(),
which is currently shared with QMP.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

monitor.c

diff --git a/monitor.c b/monitor.c
index 7959504..03f3c18 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3917,7 +3917,15 @@
     if (handler_is_async(cmd)) {
         user_async_cmd_handler(mon, cmd, qdict);
     } else if (handler_is_qobject(cmd)) {
-        monitor_call_handler(mon, cmd, qdict);
+        QObject *data = NULL;
+
+        /* XXX: ignores the error code */
+        cmd->mhandler.cmd_new(mon, qdict, &data);
+        assert(!monitor_has_error(mon));
+        if (data) {
+            cmd->user_print(mon, data);
+            qobject_decref(data);
+        }
     } else {
         cmd->mhandler.cmd(mon, qdict);
     }