From patchwork Wed Feb 18 11:10:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 440915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1B7CB14007F for ; Wed, 18 Feb 2015 22:14:42 +1100 (AEDT) Received: from localhost ([::1]:49935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO2aW-0004L8-6P for incoming@patchwork.ozlabs.org; Wed, 18 Feb 2015 06:14:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO2Ws-0006La-8Q for qemu-devel@nongnu.org; Wed, 18 Feb 2015 06:10:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO2Wk-0006jc-SA for qemu-devel@nongnu.org; Wed, 18 Feb 2015 06:10:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO2Wk-0006jO-Jf for qemu-devel@nongnu.org; Wed, 18 Feb 2015 06:10:46 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1IBAk9O010358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 18 Feb 2015 06:10:46 -0500 Received: from blackfin.pond.sub.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1IBAil8005554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 18 Feb 2015 06:10:45 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F3689303F914; Wed, 18 Feb 2015 12:10:41 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 18 Feb 2015 12:10:35 +0100 Message-Id: <1424257841-18634-6-git-send-email-armbru@redhat.com> In-Reply-To: <1424257841-18634-1-git-send-email-armbru@redhat.com> References: <1424257841-18634-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 05/11] monitor: Avoid qerror_report_err() outside QMP command handlers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qerror_report_err() is a transitional interface to help with converting existing monitor commands to QMP. It should not be used elsewhere. Replace by error_report_err() in HMP command handler hmp_trace_event(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- monitor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index ac2a4ab..b109188 100644 --- a/monitor.c +++ b/monitor.c @@ -889,8 +889,7 @@ static void do_trace_event_set_state(Monitor *mon, const QDict *qdict) qmp_trace_event_set_state(tp_name, new_state, true, true, &local_err); if (local_err) { - qerror_report_err(local_err); - error_free(local_err); + error_report_err(local_err); } }