From nobody Mon May 6 09:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487696821564927.7899857777933; Tue, 21 Feb 2017 09:07:01 -0800 (PST) Received: from localhost ([::1]:47004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgDtv-0003MX-Tz for importer@patchew.org; Tue, 21 Feb 2017 12:06:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgD57-0004X5-04 for qemu-devel@nongnu.org; Tue, 21 Feb 2017 11:14:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgD53-00066a-Ll for qemu-devel@nongnu.org; Tue, 21 Feb 2017 11:14:24 -0500 Received: from smtp3.mundo-r.com ([212.51.32.191]:36288 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgD53-00066E-7P; Tue, 21 Feb 2017 11:14:21 -0500 Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 21 Feb 2017 17:14:18 +0100 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1cgD50-0004oy-Tt; Tue, 21 Feb 2017 17:14:19 +0100 Received: from berto by perseus.local with local (Exim 4.88) (envelope-from ) id 1cgD4i-0005mp-OC; Tue, 21 Feb 2017 18:14:00 +0200 IronPort-PHdr: =?us-ascii?q?9a23=3AL3ASShDW8Lnj4qhYVyuLUyQJP3N1i/DPJgcQr6Af?= =?us-ascii?q?oPdwSPX8psbcNUDSrc9gkEXOFd2CrakV1qyP7+uwBSQp2tWoiDg6aptCVhsI24?= =?us-ascii?q?09vjcLJ4q7M3D9N+PgdCcgHc5PBxdP9nC/NlVJSo6lPwWB6nK94iQPFRrhKAF7?= =?us-ascii?q?Ovr6GpLIj8Swyuu+54Dfbx9GiTe5Yb5+Ngi6oAreusQVjoZpN7o8xAbOrnZUYe?= =?us-ascii?q?pd2HlmJUiUnxby58ew+IBs/iFNsP8/9MBOTLv3cb0gQbNXEDopPWY15Nb2tRbY?= =?us-ascii?q?VguA+mEcUmQNnRVWBQXO8Qz3UY3wsiv+sep9xTWaMMjrRr06RTiu86FmQwLzhS?= =?us-ascii?q?wZKzA27n3Yis1ojKJavh2hoQB/w5XJa42RLfZyY7/Rcc8fSWdHQ81fVTFOApmk?= =?us-ascii?q?YoUPEeQPIOhWoYr6qVYVsReyGROhCP/1xzNUmnP727Ax3eQ7EQHB2QwtB84DsH?= =?us-ascii?q?DPo9rrLqcSTee1x7TJwzrZdfNZxTb955LVeR0muv6DQ6hwcdbWyUQ0FgPFgU+f?= =?us-ascii?q?qYjkPzyPzOgCr2+b7+95WO+plmUpqBlxryCry8sxkIXFm58Zx1Le+Sh9xIs5P8?= =?us-ascii?q?C0RU57bNK8DZddsy6XO5FrTs8+X21koiY3xqActZKleiUB1Y4pyATFa/OddoiF?= =?us-ascii?q?+hfjVOGMLjhmnH9lY7e/hwqq8Uin1+38StG40FZUoSpBldnBrn4N2AbV6smGS/?= =?us-ascii?q?t9+Fmu1SyO1wDc8O5EJUE0mrDBJ5E9xb4wk4IfsUXFHiDohEX7lKubelg+9uS1?= =?us-ascii?q?9ujqYK/qq5uYOoNulw3zMqQjltS6AesiMwgOW2ab+f671L3m5UD2W6tFjucqkq?= =?us-ascii?q?neq53aJMsbqbS9Aw9UyIkv8QqwDzCj0NgAh3kIMEpFeA6bj4juI1zOOe73DfKi?= =?us-ascii?q?g1i1jThk2e7GMaPlApjWKHjDl7Hhfbl7605B0gYzyspf551MALEbPP3zQlPxtM?= =?us-ascii?q?DfDhIhKgy73ePnCMhk2owFXWKPBbOWMKDJvF+O4eIvJeaMZIkIuDrnLPgl/fHu?= =?us-ascii?q?h2cjmVABZampwYcXaHegE/RlLUSZZn7sgtkaHGcQoAUxUezqh0eeUTJJe3myWK?= =?us-ascii?q?c87CkhCI26FYfDWpytgLuZ0Se+BJ1ZeGFGCkyNEHrzbYWLReoDaCKILc99iDAL?= =?us-ascii?q?Sb+hS4o53xG0qAD606ZnLvbT+iAAr53jzt116PbJlREv7jF0FdqS3HyNT25ugm?= =?us-ascii?q?MEXSM53Kd6oR819lDWyKV9nrlUGMJe49tPVQE1M4OayPZ1WP7oXQeUV9ODRUy6?= =?us-ascii?q?RZ2JCCs6T9t5l9UDeVp6M9SthxTC1myhBLpDxO/DP4A97q+Jhyu5HM160XuTkf?= =?us-ascii?q?B511Q=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2BeCgBzZqxY/5tjdVteHQEFAQsBGAEFA?= =?us-ascii?q?QsBgyYngUOeRgUBAQEBAQEFAYEeAZMohBwahgiCcUMUAQEBAQEBAQEBAQFhKII?= =?us-ascii?q?zIgGCSFJPTjSJYREBsD46i1kyhgePbQWJD5J8khINikSGSQJIkl02IYEAIBQIF?= =?us-ascii?q?xWEOAFPHYFjc4o6AQEB?= X-IPAS-Result: =?us-ascii?q?A2BeCgBzZqxY/5tjdVteHQEFAQsBGAEFAQsBgyYngUOeRgU?= =?us-ascii?q?BAQEBAQEFAYEeAZMohBwahgiCcUMUAQEBAQEBAQEBAQFhKIIzIgGCSFJPTjSJY?= =?us-ascii?q?REBsD46i1kyhgePbQWJD5J8khINikSGSQJIkl02IYEAIBQIFxWEOAFPHYFjc4o?= =?us-ascii?q?6AQEB?= X-IronPort-AV: E=Sophos;i="5.35,190,1484002800"; d="scan'208";a="113815087" From: Alberto Garcia To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 18:13:54 +0200 Message-Id: <20170221161354.22204-1-berto@igalia.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Subject: [Qemu-devel] [PATCH] block: Remove unnecessary cases of error_propagate() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , Markus Armbruster , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are several cases of local Error variables that are never used for checking actual errors: ret =3D some_call(params, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto fail; } In these cases there's no need for local_err or error_propagate(), and we can use errp directly instead. Signed-off-by: Alberto Garcia --- block.c | 4 +--- blockdev.c | 53 +++++++++++++++-------------------------------------- 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/block.c b/block.c index 743c349100..86e1023b96 100644 --- a/block.c +++ b/block.c @@ -2088,7 +2088,6 @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopen= Queue *bs_queue, Error **er { int ret =3D -1; BlockReopenQueueEntry *bs_entry, *next; - Error *local_err =3D NULL; =20 assert(bs_queue !=3D NULL); =20 @@ -2097,8 +2096,7 @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopen= Queue *bs_queue, Error **er aio_context_acquire(ctx); =20 QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) { - if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, &local_err)) { - error_propagate(errp, local_err); + if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) { goto cleanup; } bs_entry->prepared =3D true; diff --git a/blockdev.c b/blockdev.c index db82ac97e5..7db8248dad 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2221,7 +2221,6 @@ void qmp_eject(bool has_device, const char *device, bool has_id, const char *id, bool has_force, bool force, Error **errp) { - Error *local_err =3D NULL; int rc; =20 if (!has_force) { @@ -2230,12 +2229,10 @@ void qmp_eject(bool has_device, const char *device, =20 rc =3D do_open_tray(has_device ? device : NULL, has_id ? id : NULL, - force, &local_err); + force, errp); if (rc && rc !=3D -ENOSYS) { - error_propagate(errp, local_err); return; } - error_free(local_err); =20 qmp_x_blockdev_remove_medium(has_device, device, has_id, id, errp); } @@ -2324,20 +2321,13 @@ void qmp_blockdev_open_tray(bool has_device, const = char *device, bool has_force, bool force, Error **errp) { - Error *local_err =3D NULL; - int rc; - if (!has_force) { force =3D false; } - rc =3D do_open_tray(has_device ? device : NULL, - has_id ? id : NULL, - force, &local_err); - if (rc && rc !=3D -ENOSYS && rc !=3D -EINPROGRESS) { - error_propagate(errp, local_err); - return; - } - error_free(local_err); + + do_open_tray(has_device ? device : NULL, + has_id ? id : NULL, + force, errp); } =20 void qmp_blockdev_close_tray(bool has_device, const char *device, @@ -2564,13 +2554,10 @@ void qmp_blockdev_change_medium(bool has_device, co= nst char *device, =20 rc =3D do_open_tray(has_device ? device : NULL, has_id ? id : NULL, - false, &err); + false, errp); if (rc && rc !=3D -ENOSYS) { - error_propagate(errp, err); goto fail; } - error_free(err); - err =3D NULL; =20 qmp_x_blockdev_remove_medium(has_device, device, has_id, id, &err); if (err) { @@ -3011,7 +2998,6 @@ void qmp_block_commit(bool has_job_id, const char *jo= b_id, const char *device, BlockDriverState *iter; BlockDriverState *base_bs, *top_bs; AioContext *aio_context; - Error *local_err =3D NULL; /* This will be part of the QMP command, if/when the * BlockdevOnError change for blkmirror makes it in */ @@ -3026,15 +3012,14 @@ void qmp_block_commit(bool has_job_id, const char *= job_id, const char *device, * live commit feature versions; for this to work, we must make sure = to * perform the device lookup before any generic errors that may occur= in a * scenario in which all optional arguments are omitted. */ - bs =3D qmp_get_root_bs(device, &local_err); + bs =3D qmp_get_root_bs(device, errp); if (!bs) { bs =3D bdrv_lookup_bs(device, device, NULL); - if (!bs) { - error_free(local_err); + if (!bs && errp) { + error_free(*errp); + *errp =3D NULL; error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", device); - } else { - error_propagate(errp, local_err); } return; } @@ -3095,7 +3080,7 @@ void qmp_block_commit(bool has_job_id, const char *jo= b_id, const char *device, } commit_active_start(has_job_id ? job_id : NULL, bs, base_bs, BLOCK_JOB_DEFAULT, speed, on_error, NULL, NULL, - &local_err, false); + errp, false); } else { BlockDriverState *overlay_bs =3D bdrv_find_overlay(bs, top_bs); if (bdrv_op_is_blocked(overlay_bs, BLOCK_OP_TYPE_COMMIT_TARGET, er= rp)) { @@ -3103,11 +3088,7 @@ void qmp_block_commit(bool has_job_id, const char *j= ob_id, const char *device, } commit_start(has_job_id ? job_id : NULL, bs, base_bs, top_bs, spee= d, on_error, has_backing_file ? backing_file : NULL, - &local_err); - } - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - goto out; + errp); } =20 out: @@ -3447,10 +3428,9 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp) goto out; } =20 - to_replace_bs =3D check_to_replace_node(bs, arg->replaces, &local_= err); + to_replace_bs =3D check_to_replace_node(bs, arg->replaces, errp); =20 if (!to_replace_bs) { - error_propagate(errp, local_err); goto out; } =20 @@ -3527,9 +3507,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp) arg->has_on_source_error, arg->on_source_error, arg->has_on_target_error, arg->on_target_error, arg->has_unmap, arg->unmap, - &local_err); + errp); bdrv_unref(target_bs); - error_propagate(errp, local_err); out: aio_context_release(aio_context); } @@ -3551,7 +3530,6 @@ void qmp_blockdev_mirror(bool has_job_id, const char = *job_id, BlockDriverState *target_bs; AioContext *aio_context; BlockMirrorBackingMode backing_mode =3D MIRROR_LEAVE_BACKING_CHAIN; - Error *local_err =3D NULL; =20 bs =3D qmp_get_root_bs(device, errp); if (!bs) { @@ -3576,8 +3554,7 @@ void qmp_blockdev_mirror(bool has_job_id, const char = *job_id, has_on_source_error, on_source_error, has_on_target_error, on_target_error, true, true, - &local_err); - error_propagate(errp, local_err); + errp); =20 aio_context_release(aio_context); } --=20 2.11.0