From de79ba6f53fa78a6132a67c7ff134014dc8479e7 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Thu, 16 Sep 2010 11:06:11 -0300 Subject: [PATCH] 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 --- monitor.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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); } -- 2.7.4