From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bkq-0003sg-Ii for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9bkl-0007Vc-W3 for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bkl-0007VF-PW for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:07 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 64A7B35417C for ; Thu, 17 Dec 2015 16:50:07 +0000 (UTC) Received: from blackfin.pond.sub.org ([10.3.113.12]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBHGo5ir027034 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 17 Dec 2015 11:50:06 -0500 From: Markus Armbruster Date: Thu, 17 Dec 2015 17:49:43 +0100 Message-Id: <1450371004-26866-3-git-send-email-armbru@redhat.com> In-Reply-To: <1450371004-26866-1-git-send-email-armbru@redhat.com> References: <1450371004-26866-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 02/23] error: Use error_report_err() where appropriate (again) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Same Coccinelle semantic patch as in commit 565f65d. Signed-off-by: Markus Armbruster --- block/sheepdog.c | 3 +-- hw/arm/imx25_pdk.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/xlnx-ep108.c | 2 +- hw/ppc/spapr_drc.c | 6 ++---- qemu-nbd.c | 2 +- vl.c | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index d80e4ed..dd8301b 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1861,8 +1861,7 @@ static int sd_create(const char *filename, QemuOpts *opts, fd = connect_to_sdog(s, &local_err); if (fd < 0) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); + error_report_err(local_err); ret = -EIO; goto out; } diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 59a4c11..039f0eb 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -75,7 +75,7 @@ static void imx25_pdk_init(MachineState *machine) object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); if (err != NULL) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index eff6f46..f4b463a 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -74,7 +74,7 @@ static void kzm_init(MachineState *machine) object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); if (err != NULL) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index a3b9e82..3ab83a1 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -38,7 +38,7 @@ static void netduino2_init(MachineState *machine) qdev_prop_set_string(dev, "cpu-model", "cortex-m3"); object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err != NULL) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } } diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 85b978f..73e6087 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-ep108.c @@ -41,7 +41,7 @@ static void xlnx_ep108_init(MachineState *machine) object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); if (err) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 8be62c3..4fb86a6 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -465,8 +465,7 @@ static void realize(DeviceState *d, Error **errp) object_property_add_alias(root_container, link_name, drc->owner, child_name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } g_free(child_name); @@ -486,8 +485,7 @@ static void unrealize(DeviceState *d, Error **errp) snprintf(name, sizeof(name), "%x", drck->get_index(drc)); object_property_del(root_container, name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index 0d47f14..2881d84 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -747,7 +747,7 @@ int main(int argc, char **argv) exp = nbd_export_new(blk, dev_offset, fd_size, nbdflags, nbd_export_closed, &local_err); if (!exp) { - error_report("%s", error_get_pretty(local_err)); + error_report_err(local_err); exit(EXIT_FAILURE); } diff --git a/vl.c b/vl.c index 5cc6bfd..5a395e9 100644 --- a/vl.c +++ b/vl.c @@ -4553,7 +4553,7 @@ int main(int argc, char **argv, char **envp) Error *local_err = NULL; qemu_boot_set(boot_once, &local_err); if (local_err) { - error_report("%s", error_get_pretty(local_err)); + error_report_err(local_err); exit(1); } qemu_register_reset(restore_boot_order, g_strdup(boot_order)); -- 2.4.3