From patchwork Tue Feb 10 16:34:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 438466 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 0594114012E for ; Wed, 11 Feb 2015 03:40:41 +1100 (AEDT) Received: from localhost ([::1]:40632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLDra-0003Nf-TK for incoming@patchwork.ozlabs.org; Tue, 10 Feb 2015 11:40:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLDlf-00011r-C1 for qemu-devel@nongnu.org; Tue, 10 Feb 2015 11:34:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLDlX-0006xU-By for qemu-devel@nongnu.org; Tue, 10 Feb 2015 11:34:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLDlX-0006xK-5p for qemu-devel@nongnu.org; Tue, 10 Feb 2015 11:34:23 -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.14.4/8.14.4) with ESMTP id t1AGYMB5012989 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 10 Feb 2015 11:34:22 -0500 Received: from blackfin.pond.sub.org (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1AGYJWk017792 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 10 Feb 2015 11:34:22 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A8586305D0DC; Tue, 10 Feb 2015 17:34:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 10 Feb 2015 17:34:15 +0100 Message-Id: <1423586055-4932-10-git-send-email-armbru@redhat.com> In-Reply-To: <1423586055-4932-1-git-send-email-armbru@redhat.com> References: <1423586055-4932-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 9/9] qemu-char: 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 legacy chardev parser qemu_chr_parse_compat(). Legacy chardev syntax is not to be used in QMP. Signed-off-by: Markus Armbruster --- qemu-char.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index f901ed1..8159462 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3306,8 +3306,7 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) opts = qemu_opts_create(qemu_find_opts("chardev"), label, 1, &local_err); if (local_err) { - qerror_report_err(local_err); - error_free(local_err); + error_report_err(local_err); return NULL; }