From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C30BC07545 for ; Tue, 24 Oct 2023 11:52:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvFwe-0005Vb-4q; Tue, 24 Oct 2023 07:51:36 -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 1qvFwb-0005UP-U7 for qemu-devel@nongnu.org; Tue, 24 Oct 2023 07:51:33 -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 1qvFwa-00077b-3h for qemu-devel@nongnu.org; Tue, 24 Oct 2023 07:51:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698148289; 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:autocrypt:autocrypt; bh=ae2Trvvpqh1O2ZMTazD9q+U06uwv+I8VAByl1MMnHhU=; b=iqSFWrYcwNgHgur8NM23HW/Cq7N9qq9Pv+AOpFdfsmvR9RIBPu86QgJvy6HmlTuhUgmOA4 8w42RfOqgbvKyjp4lZgv3JVmT6imokatNMHLAztNeEX9xQiZBrc6JaB/DfNs+3yvb52ZwI GSJ9OtDl4DoTsK36C1zVqneDomIQ13M= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-179-0VpxB3foONeLpRHTVxMCQg-1; Tue, 24 Oct 2023 07:51:28 -0400 X-MC-Unique: 0VpxB3foONeLpRHTVxMCQg-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7788fa5f1b0so555579985a.2 for ; Tue, 24 Oct 2023 04:51:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698148288; x=1698753088; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ae2Trvvpqh1O2ZMTazD9q+U06uwv+I8VAByl1MMnHhU=; b=PFrta+1B/yETaYc+c5Dk+WiKDg5w5fJRCiyNVdsWSu7Vin5nkw8xlzwk78cBjeHCqX qnPv36m0ZeC3kqswe3MvEEi2A7YUJlec4SoUHYEi0AkrQliYn0dh8wAMAt17MSzGlOEl 3vRJhjjNeoELL+9oFbMW7mqz2xVFAHqKO3aDnAdf7AC01gZRFAFZXBNc9Q945ausEDHi B5EoqR9/dAW7o/gFVDiD1pwNrxOcfxnHfdg/xaBJeTfWWkszEvT74vAwqeaoE7VtK/h8 tjrraLE0APdBkhcqUmitDFQfGLdSyzEL2QzNYeKZ7kwBmczUlWZN+iVozsqkirxugV1+ PYbw== X-Gm-Message-State: AOJu0YxkMvqmWS0Kv3sd9Dksla3gXC2+Z0f9Rhz2gFyCZ2Tn5zOpjkVs oUPMbVvOiXz1Xa/KChfa7BkccMg1flZis1OS8Z4I5eZubNHSNKUMEsJwnCf6jznD6yrLHMxafw6 1NHoAxPeksJy3Li4= X-Received: by 2002:a05:620a:170a:b0:774:30b7:ed93 with SMTP id az10-20020a05620a170a00b0077430b7ed93mr13220693qkb.29.1698148288057; Tue, 24 Oct 2023 04:51:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJS33YAAxE5Mb2vkz1lPjffpzrB6kQSk5EEye3B3Z3tfTWKfBxJ1lSA3skfBQg0FdMkjboEg== X-Received: by 2002:a05:620a:170a:b0:774:30b7:ed93 with SMTP id az10-20020a05620a170a00b0077430b7ed93mr13220684qkb.29.1698148287784; Tue, 24 Oct 2023 04:51:27 -0700 (PDT) Received: from [10.33.192.205] (nat-pool-str-t.redhat.com. [149.14.88.106]) by smtp.gmail.com with ESMTPSA id c3-20020a05620a134300b0076f058f5834sm3378552qkl.61.2023.10.24.04.51.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 24 Oct 2023 04:51:27 -0700 (PDT) Message-ID: Date: Tue, 24 Oct 2023 13:51:25 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] block/snapshot: Fix compiler warning with -Wshadow=local Content-Language: en-US To: Markus Armbruster Cc: Hanna Reitz , Kevin Wolf , qemu-devel@nongnu.org, qemu-block@nongnu.org References: <20231023175038.111607-1-thuth@redhat.com> <87zg08vcwd.fsf@pond.sub.org> <875y2ws3vq.fsf@pond.sub.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <875y2ws3vq.fsf@pond.sub.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@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, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 24/10/2023 12.37, Markus Armbruster wrote: > Markus Armbruster writes: > >> Thomas Huth writes: >> >>> No need to declare a new variable in the the inner code block >>> here, we can re-use the "ret" variable that has been declared >>> at the beginning of the function. With this change, the code >>> can now be successfully compiled with -Wshadow=local again. >>> >>> Fixes: a32e781838 ("Mark bdrv_snapshot_fallback() and callers GRAPH_RDLOCK") >>> Signed-off-by: Thomas Huth >>> --- >>> v2: Assign "ret" only in one spot >>> >>> block/snapshot.c | 6 ++---- >>> 1 file changed, 2 insertions(+), 4 deletions(-) >>> >>> diff --git a/block/snapshot.c b/block/snapshot.c >>> index 6e16eb803a..55974273ae 100644 >>> --- a/block/snapshot.c >>> +++ b/block/snapshot.c >>> @@ -629,7 +629,6 @@ int bdrv_all_goto_snapshot(const char *name, >>> while (iterbdrvs) { >>> BlockDriverState *bs = iterbdrvs->data; >>> AioContext *ctx = bdrv_get_aio_context(bs); >>> - int ret = 0; >>> bool all_snapshots_includes_bs; >>> >>> aio_context_acquire(ctx); >>> @@ -637,9 +636,8 @@ int bdrv_all_goto_snapshot(const char *name, >>> all_snapshots_includes_bs = bdrv_all_snapshots_includes_bs(bs); >>> bdrv_graph_rdunlock_main_loop(); >>> >>> - if (devices || all_snapshots_includes_bs) { >>> - ret = bdrv_snapshot_goto(bs, name, errp); >>> - } >>> + ret = (devices || all_snapshots_includes_bs) ? >>> + bdrv_snapshot_goto(bs, name, errp) : 0; >>> aio_context_release(ctx); >>> if (ret < 0) { >>> bdrv_graph_rdlock_main_loop(); >> >> Better. Unconditional assignment to @ret right before it's checked is >> how we should use @ret. >> >> Reviewed-by: Markus Armbruster >> >> And queued. Thanks! > > Mind if I drop the Fixes: tag? Nothing broken until we enable > -Wshadow=local... Fine for me! Thomas