From patchwork Tue Dec 22 03:09:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 41583 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 14BFEB6F0C for ; Tue, 22 Dec 2009 14:09:53 +1100 (EST) Received: from localhost ([127.0.0.1]:52691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMv89-00053D-UO for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 22:09:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMv7h-00052u-NX for qemu-devel@nongnu.org; Mon, 21 Dec 2009 22:09:21 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMv7d-00052B-Bw for qemu-devel@nongnu.org; Mon, 21 Dec 2009 22:09:21 -0500 Received: from [199.232.76.173] (port=56927 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMv7d-000528-5B for qemu-devel@nongnu.org; Mon, 21 Dec 2009 22:09:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39704) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMv7c-00028t-M4 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 22:09:16 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBM39CDa020788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Dec 2009 22:09:12 -0500 Received: from doriath (vpn-8-73.rdu.redhat.com [10.11.8.73]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBM399DN031914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 21 Dec 2009 22:09:11 -0500 Date: Tue, 22 Dec 2009 01:09:06 -0200 From: Luiz Capitulino To: qemu-devel@nongnu.org Message-ID: <20091222010906.4a42ab1d@doriath> Organization: Red Hat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: nathan@parenthephobia.org.uk, aliguori@us.ibm.com Subject: [Qemu-devel] [STABLE 0.12] QMP: Drop wrong assert() 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 Some commands return a QList of QDicts, which is valid, but will trig the assert(). Just drop it. Reported-by: Nathan Baum Signed-off-by: Luiz Capitulino --- monitor.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index c0dc48e..3af1d5c 100644 --- a/monitor.c +++ b/monitor.c @@ -283,7 +283,6 @@ static void monitor_protocol_emitter(Monitor *mon, QObject *data) if (!monitor_has_error(mon)) { /* success response */ if (data) { - assert(qobject_type(data) == QTYPE_QDICT); qobject_incref(data); qdict_put_obj(qmp, "return", data); } else {