From patchwork Wed Jan 13 15:43:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 567037 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 ED0F3140307 for ; Thu, 14 Jan 2016 03:01:51 +1100 (AEDT) Received: from localhost ([::1]:37885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNrp-0006z9-T9 for incoming@patchwork.ozlabs.org; Wed, 13 Jan 2016 11:01:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaU-0004DO-CW for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:44:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJNaQ-0001Au-P0 for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaQ-0001AP-Df for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:50 -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 0B30AB5C20 for ; Wed, 13 Jan 2016 15:43:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-28.phx2.redhat.com [10.3.113.28]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0DFhjOg015917 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 13 Jan 2016 10:43:48 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7F7153004F90; Wed, 13 Jan 2016 16:43:41 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 13 Jan 2016 16:43:25 +0100 Message-Id: <1452699819-26608-28-git-send-email-armbru@redhat.com> In-Reply-To: <1452699819-26608-1-git-send-email-armbru@redhat.com> References: <1452699819-26608-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 27/41] error: Use error_reportf_err() where it makes obvious sense 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 Done with this Coccinelle semantic patch @@ expression FMT, E, S; expression list ARGS; @@ - error_report(FMT, ARGS, error_get_pretty(E)); + error_reportf_err(E, FMT/*@@@*/, ARGS); ( - error_free(E); | exit(S); | abort(); ) followed by a replace of '%s"/*@@@*/' by '"' and some line rewrapping, because I can't figure out how to make Coccinelle transform strings. We now use the error whole instead of just its message obtained with error_get_pretty(). This avoids suppressing its hint (see commit 50b7b00), but I can't see how the errors touched in this commit could come with hints. Signed-off-by: Markus Armbruster Message-Id: <1450452927-8346-12-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- arch_init.c | 4 +--- block/sheepdog.c | 5 ++--- blockdev.c | 12 +++++------- hw/arm/cubieboard.c | 9 ++++----- hw/arm/digic_boards.c | 3 +-- hw/core/qdev-properties.c | 6 ++---- hw/core/qdev.c | 5 ++--- hw/i386/pc.c | 5 ++--- hw/ppc/e500.c | 4 ++-- hw/usb/bus.c | 5 ++--- qemu-img.c | 33 +++++++++++++-------------------- qemu-nbd.c | 11 +++++------ replay/replay.c | 3 +-- tests/test-aio.c | 4 +--- tests/test-thread-pool.c | 4 +--- ui/vnc.c | 4 +--- vl.c | 6 ++---- 17 files changed, 47 insertions(+), 76 deletions(-) diff --git a/arch_init.c b/arch_init.c index 38f5fb9..d1383b3 100644 --- a/arch_init.c +++ b/arch_init.c @@ -258,9 +258,7 @@ void do_acpitable_option(const QemuOpts *opts) acpi_table_add(opts, &err); if (err) { - error_report("Wrong acpi table provided: %s", - error_get_pretty(err)); - error_free(err); + error_reportf_err(err, "Wrong acpi table provided: "); exit(1); } #endif diff --git a/block/sheepdog.c b/block/sheepdog.c index dd8301b..6986be8 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2405,9 +2405,8 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) ret = do_sd_create(s, &new_vid, 1, &local_err); if (ret < 0) { - error_report("failed to create inode for snapshot: %s", - error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, + "failed to create inode for snapshot: "); goto cleanup; } diff --git a/blockdev.c b/blockdev.c index 2df0c6d..1392fff 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1582,13 +1582,11 @@ static void internal_snapshot_abort(BlkActionState *common) } if (bdrv_snapshot_delete(bs, sn->id_str, sn->name, &local_error) < 0) { - error_report("Failed to delete snapshot with id '%s' and name '%s' on " - "device '%s' in abort: %s", - sn->id_str, - sn->name, - bdrv_get_device_name(bs), - error_get_pretty(local_error)); - error_free(local_error); + error_reportf_err(local_error, + "Failed to delete snapshot with id '%s' and " + "name '%s' on device '%s' in abort: ", + sn->id_str, sn->name, + bdrv_get_device_name(bs)); } } diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index bf068cd..a71e43c 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -39,27 +39,26 @@ static void cubieboard_init(MachineState *machine) object_property_set_int(OBJECT(&s->a10->emac), 1, "phy-addr", &err); if (err != NULL) { - error_report("Couldn't set phy address: %s", error_get_pretty(err)); + error_reportf_err(err, "Couldn't set phy address: "); exit(1); } object_property_set_int(OBJECT(&s->a10->timer), 32768, "clk0-freq", &err); if (err != NULL) { - error_report("Couldn't set clk0 frequency: %s", error_get_pretty(err)); + error_reportf_err(err, "Couldn't set clk0 frequency: "); exit(1); } object_property_set_int(OBJECT(&s->a10->timer), 24000000, "clk1-freq", &err); if (err != NULL) { - error_report("Couldn't set clk1 frequency: %s", error_get_pretty(err)); + error_reportf_err(err, "Couldn't set clk1 frequency: "); exit(1); } object_property_set_bool(OBJECT(s->a10), true, "realized", &err); if (err != NULL) { - error_report("Couldn't realize Allwinner A10: %s", - error_get_pretty(err)); + error_reportf_err(err, "Couldn't realize Allwinner A10: "); exit(1); } diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 710045a..dfaed25 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -64,8 +64,7 @@ static void digic4_board_init(DigicBoard *board) s->digic = DIGIC(object_new(TYPE_DIGIC)); object_property_set_bool(OBJECT(s->digic), true, "realized", &err); if (err != NULL) { - error_report("Couldn't realize DIGIC SoC: %s", - error_get_pretty(err)); + error_reportf_err(err, "Couldn't realize DIGIC SoC: "); exit(1); } diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index fffb58e..3572810 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1063,10 +1063,8 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, object_property_parse(OBJECT(dev), prop->value, prop->property, &err); if (err != NULL) { assert(prop->user_provided); - error_report("Warning: global %s.%s=%s ignored: %s", - prop->driver, prop->property, prop->value, - error_get_pretty(err)); - error_free(err); + error_reportf_err(err, "Warning: global %s.%s=%s ignored: ", + prop->driver, prop->property, prop->value); return; } } diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 4e3173d..2c7101d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -370,9 +370,8 @@ void qdev_init_nofail(DeviceState *dev) object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { - error_report("Initialization of device %s failed: %s", - object_get_typename(OBJECT(dev)), - error_get_pretty(err)); + error_reportf_err(err, "Initialization of device %s failed: ", + object_get_typename(OBJECT(dev))); exit(1); } } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 166e8e2..0e5c86a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1253,9 +1253,8 @@ void pc_acpi_init(const char *default_dsdt) acpi_table_add_builtin(opts, &err); if (err) { - error_report("WARNING: failed to load %s: %s", filename, - error_get_pretty(err)); - error_free(err); + error_reportf_err(err, "WARNING: failed to load %s: ", + filename); } g_free(filename); } diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index b3418db..bd7da47 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -751,8 +751,8 @@ static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params, dev = ppce500_init_mpic_kvm(params, irqs, &err); } if (machine_kernel_irqchip_required(machine) && !dev) { - error_report("kernel_irqchip requested but unavailable: %s", - error_get_pretty(err)); + error_reportf_err(err, + "kernel_irqchip requested but unavailable: "); exit(1); } } diff --git a/hw/usb/bus.c b/hw/usb/bus.c index ee6b43a..26ab67f 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -725,9 +725,8 @@ USBDevice *usbdevice_create(const char *cmdline) } object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { - error_report("Failed to initialize USB device '%s': %s", - f->name, error_get_pretty(err)); - error_free(err); + error_reportf_err(err, "Failed to initialize USB device '%s': ", + f->name); object_unparent(OBJECT(dev)); return NULL; } diff --git a/qemu-img.c b/qemu-img.c index f4f5540..a5949e6 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -213,9 +213,7 @@ static BlockBackend *img_open(const char *id, const char *filename, blk = blk_new_open(id, filename, NULL, options, flags, &local_err); if (!blk) { - error_report("Could not open '%s': %s", filename, - error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, "Could not open '%s': ", filename); goto fail; } @@ -360,8 +358,7 @@ static int img_create(int argc, char **argv) bdrv_img_create(filename, fmt, base_filename, base_fmt, options, img_size, BDRV_O_FLAGS, &local_err, quiet); if (local_err) { - error_report("%s: %s", filename, error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, "%s: ", filename); goto fail; } @@ -1711,9 +1708,7 @@ static int img_convert(int argc, char **argv) bdrv_snapshot_load_tmp_by_id_or_name(bs[0], snapshot_name, &local_err); } if (local_err) { - error_report("Failed to load snapshot: %s", - error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, "Failed to load snapshot: "); ret = -1; goto out; } @@ -1809,9 +1804,8 @@ static int img_convert(int argc, char **argv) /* Create the new image */ ret = bdrv_create(drv, out_filename, opts, &local_err); if (ret < 0) { - error_report("%s: error while converting %s: %s", - out_filename, out_fmt, error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, "%s: error while converting %s: ", + out_filename, out_fmt); goto out; } } @@ -2439,9 +2433,8 @@ static int img_snapshot(int argc, char **argv) case SNAPSHOT_DELETE: bdrv_snapshot_delete_by_id_or_name(bs, snapshot_name, &err); if (err) { - error_report("Could not delete snapshot '%s': %s", - snapshot_name, error_get_pretty(err)); - error_free(err); + error_reportf_err(err, "Could not delete snapshot '%s': ", + snapshot_name); ret = 1; } break; @@ -2574,9 +2567,9 @@ static int img_rebase(int argc, char **argv) blk_old_backing = blk_new_open("old_backing", backing_name, NULL, options, src_flags, &local_err); if (!blk_old_backing) { - error_report("Could not open old backing file '%s': %s", - backing_name, error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, + "Could not open old backing file '%s': ", + backing_name); goto out; } @@ -2591,9 +2584,9 @@ static int img_rebase(int argc, char **argv) blk_new_backing = blk_new_open("new_backing", out_baseimg, NULL, options, src_flags, &local_err); if (!blk_new_backing) { - error_report("Could not open new backing file '%s': %s", - out_baseimg, error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, + "Could not open new backing file '%s': ", + out_baseimg); goto out; } } diff --git a/qemu-nbd.c b/qemu-nbd.c index b8be3bc..f9fce4a 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -495,8 +495,8 @@ int main(int argc, char **argv) BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, &local_err); if (local_err) { - error_report("Failed to parse detect_zeroes mode: %s", - error_get_pretty(local_err)); + error_reportf_err(local_err, + "Failed to parse detect_zeroes mode: "); exit(EXIT_FAILURE); } if (detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP && @@ -703,8 +703,8 @@ int main(int argc, char **argv) srcpath = argv[optind]; blk = blk_new_open("hda", srcpath, NULL, options, flags, &local_err); if (!blk) { - error_report("Failed to blk_new_open '%s': %s", argv[optind], - error_get_pretty(local_err)); + error_reportf_err(local_err, "Failed to blk_new_open '%s': ", + argv[optind]); exit(EXIT_FAILURE); } bs = blk_bs(blk); @@ -719,8 +719,7 @@ int main(int argc, char **argv) &local_err); } if (ret < 0) { - error_report("Failed to load snapshot: %s", - error_get_pretty(local_err)); + error_reportf_err(local_err, "Failed to load snapshot: "); exit(EXIT_FAILURE); } diff --git a/replay/replay.c b/replay/replay.c index 0d33e82..e4673b3 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -291,8 +291,7 @@ void replay_start(void) } if (replay_blockers) { - error_report("Record/replay: %s", - error_get_pretty(replay_blockers->data)); + error_reportf_err(replay_blockers->data, "Record/replay: "); exit(1); } if (!use_icount) { diff --git a/tests/test-aio.c b/tests/test-aio.c index f0b447e..6ccea98 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -832,9 +832,7 @@ int main(int argc, char **argv) ctx = aio_context_new(&local_error); if (!ctx) { - error_report("Failed to create AIO Context: %s", - error_get_pretty(local_error)); - error_free(local_error); + error_reportf_err(local_error, "Failed to create AIO Context: "); exit(1); } src = aio_get_g_source(ctx); diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c index 153b8f5..ccdee39 100644 --- a/tests/test-thread-pool.c +++ b/tests/test-thread-pool.c @@ -229,9 +229,7 @@ int main(int argc, char **argv) ctx = aio_context_new(&local_error); if (!ctx) { - error_report("Failed to create AIO Context: %s", - error_get_pretty(local_error)); - error_free(local_error); + error_reportf_err(local_error, "Failed to create AIO Context: "); exit(1); } pool = aio_get_thread_pool(ctx); diff --git a/ui/vnc.c b/ui/vnc.c index 09756cd..54673eb 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3861,9 +3861,7 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) vnc_display_init(id); vnc_display_open(id, &local_err); if (local_err != NULL) { - error_report("Failed to start VNC server: %s", - error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, "Failed to start VNC server: "); exit(1); } return 0; diff --git a/vl.c b/vl.c index 7548fa2..20a367b 100644 --- a/vl.c +++ b/vl.c @@ -3043,7 +3043,7 @@ int main(int argc, char **argv, char **envp) runstate_init(); if (qcrypto_init(&err) < 0) { - error_report("cannot initialize crypto: %s", error_get_pretty(err)); + error_reportf_err(err, "cannot initialize crypto: "); exit(1); } rtc_clock = QEMU_CLOCK_HOST; @@ -4649,9 +4649,7 @@ int main(int argc, char **argv, char **envp) Error *local_err = NULL; qemu_start_incoming_migration(incoming, &local_err); if (local_err) { - error_report("-incoming %s: %s", incoming, - error_get_pretty(local_err)); - error_free(local_err); + error_reportf_err(local_err, "-incoming %s: ", incoming); exit(1); } } else if (autostart) {