From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53598 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPcIN-0003Tw-Jx for qemu-devel@nongnu.org; Mon, 06 Dec 2010 09:44:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPcIM-000556-97 for qemu-devel@nongnu.org; Mon, 06 Dec 2010 09:44:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPcIM-00054q-18 for qemu-devel@nongnu.org; Mon, 06 Dec 2010 09:44:02 -0500 From: Luiz Capitulino Date: Mon, 6 Dec 2010 12:43:48 -0200 Message-Id: <1291646631-4609-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1291646631-4609-1-git-send-email-lcapitulino@redhat.com> References: <1291646631-4609-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] QMP: Fix default response regression List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: qemu-devel@nongnu.org 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 files changed, 2 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index ec31eac..1296c40 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); } } -- 1.7.3.3.398.g0b0cd