From patchwork Tue Nov 23 18:49:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 72722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4D935B70AF for ; Wed, 24 Nov 2010 05:52:22 +1100 (EST) Received: from localhost ([127.0.0.1]:43098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKxyV-0002TP-7G for incoming@patchwork.ozlabs.org; Tue, 23 Nov 2010 13:52:19 -0500 Received: from [140.186.70.92] (port=41260 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKxw0-0001WX-Jb for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:49:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKxvz-0005p9-DA for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:49:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKxvz-0005p0-46 for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:49:43 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oANIngNK005426 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 23 Nov 2010 13:49:42 -0500 Received: from localhost ([10.3.113.10]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oANInfaR003318 for ; Tue, 23 Nov 2010 13:49:41 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 23 Nov 2010 16:49:33 -0200 Message-Id: <1290538175-2437-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1290538175-2437-1-git-send-email-lcapitulino@redhat.com> References: <1290538175-2437-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/3] QMP: Fix default response regression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 8cee35d..c4efe58 100644 --- a/monitor.c +++ b/monitor.c @@ -4426,10 +4426,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); } }