From nobody Tue May 7 01:58:03 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; dkim=fail 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 1494517092843178.99906039837526; Thu, 11 May 2017 08:38:12 -0700 (PDT) Received: from localhost ([::1]:48899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8qAN-0002kU-Em for importer@patchew.org; Thu, 11 May 2017 11:38:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8pdT-0004lD-7g for qemu-devel@nongnu.org; Thu, 11 May 2017 11:04:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8pdO-0002b5-8w for qemu-devel@nongnu.org; Thu, 11 May 2017 11:04:11 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:58671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8pdN-0002aQ-UR; Thu, 11 May 2017 11:04:06 -0400 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 1d8pdJ-0005Mz-T3; Thu, 11 May 2017 17:04:02 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1d8pd2-0005az-4H; Thu, 11 May 2017 18:03:44 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Message-Id:Date:Subject:Cc:To:From; bh=XJ/+vF6rMBdlRHq+5ac1XWf7hDGQhJ+8ujoLBMZ/2Yk=; b=OSMAj/CC94aIkgGF2ow+he95GfN66Sule0Geiq35sMK/ia/qKlmfEi+3f1Sevfl7eT5cylHvtyCA1Hw132th1vOg1f6NHN1sJgvrQ4E4Kc/SdWBqN/YxnyUaJUp+To8mc7XTQ8u7xBiGtTiPpX+GQ91ihRALo+3exHridK8rBYLTapXIvNcWzng8J4K/SsFQhNZYIZClWhsaSJZKSCFMobxTcW6ZsFrzwpScaoiK5YtyjvoTBZfjk+6Lz7Y2h3t3WN7e5Krzr88GSDk86+iwAGskdekmHoXsF0Q9acJ/RHlDkaDFpCVsBpVRR5kewvagluStRaU7q1aQK6s6QOw8pw==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 11 May 2017 18:03:37 +0300 Message-Id: <20170511150337.21470-1-berto@igalia.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH] qcow2: remove extra local_error variable 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 , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit d7086422b1c1e75e320519cfe26176db6ec97a37 added a local_err variable global to the qcow2_amend_options() function, so there's no need to have this other one. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake --- block/qcow2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1c2697732b..5e9cc26c4e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3215,7 +3215,6 @@ static int qcow2_amend_options(BlockDriverState *bs, = QemuOpts *opts, =20 if (s->refcount_bits !=3D refcount_bits) { int refcount_order =3D ctz32(refcount_bits); - Error *local_error =3D NULL; =20 if (new_version < 3 && refcount_bits !=3D 16) { error_report("Different refcount widths than 16 bits require " @@ -3227,9 +3226,9 @@ static int qcow2_amend_options(BlockDriverState *bs, = QemuOpts *opts, helper_cb_info.current_operation =3D QCOW2_CHANGING_REFCOUNT_ORDER; ret =3D qcow2_change_refcount_order(bs, refcount_order, &qcow2_amend_helper_cb, - &helper_cb_info, &local_error); + &helper_cb_info, &local_err); if (ret < 0) { - error_report_err(local_error); + error_report_err(local_err); return ret; } } --=20 2.11.0