From nobody Wed Feb 11 05:35:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695977669; cv=none; d=zohomail.com; s=zohoarc; b=Ha87VlLOndJNYnEho2yssDp/IkpPmFLXokfleOD8ZHF5Z5tB9ngKRcs7tjcyf0qmVUEfOoBB4pLRxLzkaMBGCs7r1cC2g8yfCOxpelMIZSsTkkdb8IilSOjMy+bKzSVHrVmE23ozl2R3sGEbxlg+eI+eG2plxbpULvln329rhn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695977669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AdvBa4qTGyIPvbPpH9Y1qQjgn148Pa4Brs8tUkF5otQ=; b=hmhcPJKzxSmAg3icGZKGVc/WaVjPRlGAE8BzQUjToskY4BolLNNR+kFy9oxuqFwxa5mPNSzsaWWwENyxy/9Im+1DdfKVjAgattijNDDBLogINPhpPQdITIpYz7+O2fiB6xRv1VYoyubkkj1VS3HjY5bA+HAUaRVNgqFwuBzhVX8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695977669818500.6302655816173; Fri, 29 Sep 2023 01:54:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9DQ-0004zm-8o; Fri, 29 Sep 2023 04:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9DG-0004wZ-TI for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9D8-0005au-90 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:06 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-45-bQFxHUdQMHC6HguzASSGsQ-1; Fri, 29 Sep 2023 04:50:55 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 77417802C1A for ; Fri, 29 Sep 2023 08:50:55 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5569CC15BB8 for ; Fri, 29 Sep 2023 08:50:55 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5DFF621E690E; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AdvBa4qTGyIPvbPpH9Y1qQjgn148Pa4Brs8tUkF5otQ=; b=R28fUa1+jnxMDCBfYrmi4mbuv8FPteMR37FjePkt4WPxmiPVdgftRl4AkpVmJV8he2xZTP yYZDx6/Uvi6k89ZIkyjeebhCjZTN967tSGCyqW1A9Ab41q6PnwKGdl+wGn0GoTKz/fgZXt /zXN8pi7GoHySihEYpr4njmDqFn4pu8= X-MC-Unique: bQFxHUdQMHC6HguzASSGsQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Kevin Wolf Subject: [PULL 05/56] block/vdi: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:02 +0200 Message-ID: <20230929085053.2789105-6-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695977670997100007 Content-Type: text/plain; charset="utf-8" Local variables shadowing other local variables or parameters make the code needlessly hard to understand. Tracked down with -Wshadow=3Dlocal. Clean up: delete inner declarations when they are actually redundant, else rename variables. Signed-off-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi Reviewed-by: Kevin Wolf Message-ID: <20230921121312.1301864-6-armbru@redhat.com> --- block/vdi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 6c35309e04..934e1b849b 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -634,7 +634,6 @@ vdi_co_pwritev(BlockDriverState *bs, int64_t offset, in= t64_t bytes, bmap_entry =3D le32_to_cpu(s->bmap[block_index]); if (!VDI_IS_ALLOCATED(bmap_entry)) { /* Allocate new block and write to it. */ - uint64_t data_offset; qemu_co_rwlock_upgrade(&s->bmap_lock); bmap_entry =3D le32_to_cpu(s->bmap[block_index]); if (VDI_IS_ALLOCATED(bmap_entry)) { @@ -700,7 +699,7 @@ nonallocating_write: /* One or more new blocks were allocated. */ VdiHeader *header; uint8_t *base; - uint64_t offset; + uint64_t bmap_offset; uint32_t n_sectors; =20 g_free(block); @@ -723,11 +722,11 @@ nonallocating_write: bmap_first /=3D (SECTOR_SIZE / sizeof(uint32_t)); bmap_last /=3D (SECTOR_SIZE / sizeof(uint32_t)); n_sectors =3D bmap_last - bmap_first + 1; - offset =3D s->bmap_sector + bmap_first; + bmap_offset =3D s->bmap_sector + bmap_first; base =3D ((uint8_t *)&s->bmap[0]) + bmap_first * SECTOR_SIZE; logout("will write %u block map sectors starting from entry %u\n", n_sectors, bmap_first); - ret =3D bdrv_co_pwrite(bs->file, offset * SECTOR_SIZE, + ret =3D bdrv_co_pwrite(bs->file, bmap_offset * SECTOR_SIZE, n_sectors * SECTOR_SIZE, base, 0); } =20 --=20 2.41.0