From patchwork Wed Mar 4 10:25:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 446182 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 1E5FC14012F for ; Wed, 4 Mar 2015 21:36:05 +1100 (AEDT) Received: from localhost ([::1]:43067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT6ep-0005Qt-7l for incoming@patchwork.ozlabs.org; Wed, 04 Mar 2015 05:36:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT6eP-0004qx-3P for qemu-devel@nongnu.org; Wed, 04 Mar 2015 05:35:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YT6eK-0004CK-IG for qemu-devel@nongnu.org; Wed, 04 Mar 2015 05:35:36 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:29968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT6eA-00047t-Cm; Wed, 04 Mar 2015 05:35:23 -0500 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CKH45122; Wed, 04 Mar 2015 18:35:16 +0800 (CST) Received: from localhost (10.177.22.69) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.158.1; Wed, 4 Mar 2015 18:27:39 +0800 From: zhanghailiang To: Date: Wed, 4 Mar 2015 18:25:54 +0800 Message-ID: <1425464754-8364-1-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.2.msysgit.0 MIME-Version: 1.0 X-Originating-IP: [10.177.22.69] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Cc: zhanghailiang , peter.huangpeng@huawei.com, armbru@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v2] error: Replace error_report() & error_free() with error_report_err() 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 This is a continuation of the work started in commit 565f65d27: "error: Use error_report_err() where appropriate" Signed-off-by: zhanghailiang Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- v2: - Add Reviewd-by and commit message --- hw/arm/virt.c | 2 +- savevm.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 69f51ac..4732c12 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -768,7 +768,7 @@ static void machvirt_init(MachineState *machine) /* Handle any CPU options specified by the user */ cc->parse_features(CPU(cpuobj), cpustr[1], &err); if (err) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/savevm.c b/savevm.c index ce2b6a2..c4f8c39 100644 --- a/savevm.c +++ b/savevm.c @@ -932,8 +932,7 @@ int qemu_loadvm_state(QEMUFile *f) int ret; if (qemu_savevm_state_blocked(&local_err)) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); + error_report_err(local_err); return -EINVAL; }