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 582DBE7B5E8 for ; Wed, 4 Oct 2023 10:58:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnza7-0006xs-Ic; Wed, 04 Oct 2023 06:58:19 -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 1qnza5-0006vj-Ml for qemu-devel@nongnu.org; Wed, 04 Oct 2023 06:58:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnza4-00070D-9W for qemu-devel@nongnu.org; Wed, 04 Oct 2023 06:58:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696417095; 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: in-reply-to:in-reply-to:references:references; bh=CkXEzfY8q58Ao0db9rQ+gXYtcxVdAR/6H3WOGdQ/t6k=; b=PGCtViE84hZOrRUazhTmPTP7mXrqYcEe1G3N1tLdzZgbWEC0HkVlXtQ9ZaB/W0fghYyH3L /rISFV0CfGDjrDFYJNLUg70z2BEg60Qr0uSQXdtADE4BuPzBKnLjR4gDAqITvD3QfRe+w8 K0fM95qQWfqN3k4EN/zX+yITcat9LBo= 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-496-NuECh_0BNoequDVsRs82og-1; Wed, 04 Oct 2023 06:58:07 -0400 X-MC-Unique: NuECh_0BNoequDVsRs82og-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 45C32101A59E; Wed, 4 Oct 2023 10:58:07 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 23141140E962; Wed, 4 Oct 2023 10:58:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 161DA21E6904; Wed, 4 Oct 2023 12:58:06 +0200 (CEST) From: Markus Armbruster To: Thomas Huth Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org Subject: Re: [PATCH] hw/virtio/virtio-pci: Avoid compiler warning with -Wshadow References: <20231004075536.48219-1-thuth@redhat.com> Date: Wed, 04 Oct 2023 12:58:06 +0200 In-Reply-To: <20231004075536.48219-1-thuth@redhat.com> (Thomas Huth's message of "Wed, 4 Oct 2023 09:55:36 +0200") Message-ID: <87bkdeiri9.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 Thomas Huth writes: > "len" is used as parameter of the function virtio_write_config() > and as a local variable, so this causes a compiler warning > when compiling with "-Wshadow" and can be confusing for the reader. > Rename the local variable to "caplen" to avoid this problem. > > Signed-off-by: Thomas Huth > --- > hw/virtio/virtio-pci.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index edbc0daa18..d0ef1edd66 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -780,15 +780,15 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, > pci_cfg_data), > sizeof cfg->pci_cfg_data)) { > uint32_t off; > - uint32_t len; > + uint32_t caplen; > > cfg = (void *)(proxy->pci_dev.config + proxy->config_cap); > off = le32_to_cpu(cfg->cap.offset); > - len = le32_to_cpu(cfg->cap.length); > + caplen = le32_to_cpu(cfg->cap.length); > > - if (len == 1 || len == 2 || len == 4) { > - assert(len <= sizeof cfg->pci_cfg_data); > - virtio_address_space_write(proxy, off, cfg->pci_cfg_data, len); > + if (caplen == 1 || caplen == 2 || caplen == 4) { > + assert(caplen <= sizeof cfg->pci_cfg_data); > + virtio_address_space_write(proxy, off, cfg->pci_cfg_data, caplen); > } > } > } I see the same warning in virtio_read_config(). Care to patch that, too?