From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Thu, 16 Sep 2010 14:06:11 +0000 (-0300)
Subject: Monitor: Directly call QObject handlers
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~7109^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de79ba6f53fa78a6132a67c7ff134014dc8479e7;p=sdk%2Femulator%2Fqemu.git

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>
---

diff --git a/monitor.c b/monitor.c
index 7959504..03f3c18 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3917,7 +3917,15 @@ static void handle_user_command(Monitor *mon, const char *cmdline)
     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);
     }