From c01e68853148764d32c3a27ab4b39cb553c567fc Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 22 Nov 2010 16:22:47 -0200 Subject: [PATCH] QMP: Fix default response regression Commit 030db6e89d dropped do_info() usage from QMP and introduced qmp_call_query_cmd(). However, the new function doesn't emit QMP's default OK response when the handler doesn't return data. Fix that by also calling monitor_protocol_emitter() when ret_data == NULL, so that the default response is emitted. Signed-off-by: Luiz Capitulino --- monitor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index ec31eac8c1..1296c40256 100644 --- a/monitor.c +++ b/monitor.c @@ -4464,10 +4464,8 @@ static void qmp_call_query_cmd(Monitor *mon, const mon_cmd_t *cmd) } } else { cmd->mhandler.info_new(mon, &ret_data); - if (ret_data) { - monitor_protocol_emitter(mon, ret_data); - qobject_decref(ret_data); - } + monitor_protocol_emitter(mon, ret_data); + qobject_decref(ret_data); } } -- 2.11.0