From nobody Mon Feb 9 19:53:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154991841842964.43221098042648; Mon, 11 Feb 2019 12:53:38 -0800 (PST) Received: from localhost ([127.0.0.1]:56110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtIa2-0007zU-Dy for importer@patchew.org; Mon, 11 Feb 2019 15:53:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtIYC-0006xD-Sm for qemu-devel@nongnu.org; Mon, 11 Feb 2019 15:51:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtIYB-0006cS-W3 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 15:51:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41316) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtIYA-0006b5-2E; Mon, 11 Feb 2019 15:51:34 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1CF5E7F3E8; Mon, 11 Feb 2019 20:51:33 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-127.phx2.redhat.com [10.3.116.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id B499358BB; Mon, 11 Feb 2019 20:51:32 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 14:51:25 -0600 Message-Id: <20190211205128.27146-2-eblake@redhat.com> In-Reply-To: <20190211205128.27146-1-eblake@redhat.com> References: <20190211205128.27146-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 11 Feb 2019 20:51:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/4] nbd/server: Kill pointless shadowed 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: Peter Maydell , "open list:Network Block Dev..." Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" lgtm.com pointed out that commit 678ba275 introduced a shadowed declaration of local variable 'bs'; thankfully, the inner 'bs' obtained by 'blk_bs(blk)' matches the outer one given that we had 'blk_insert_bs(blk, bs, errp)' a few lines earlier, and there are no later uses of 'bs' beyond the scope of the 'if (bitmap)' to care if we change the value stored in 'bs' while traveling the backing chain to find a bitmap. So simply get rid of the extra declaration. Reported-by: Peter Maydell Signed-off-by: Eric Blake Message-Id: <20190207191357.6665-1-eblake@redhat.com> Signed-off-by: Eric Blake --- nbd/server.c | 1 - 1 file changed, 1 deletion(-) diff --git a/nbd/server.c b/nbd/server.c index 838c150d8ca..0910d09a6d4 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1495,7 +1495,6 @@ NBDExport *nbd_export_new(BlockDriverState *bs, uint6= 4_t dev_offset, if (bitmap) { BdrvDirtyBitmap *bm =3D NULL; - BlockDriverState *bs =3D blk_bs(blk); while (true) { bm =3D bdrv_find_dirty_bitmap(bs, bitmap); --=20 2.20.1