From nobody Fri May 17 07:56:14 2024 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=1696311847; cv=none; d=zohomail.com; s=zohoarc; b=LYBRLugJNrHlEObpKJ0Gihaoz9f4BlRx24FEd4qX9dGYAjWbbqq4ZRBZKu0vjrvf5LmKVye1zfhR/jIRFLGQZ0lxe/DA8f+zlna5geg/MEjM4m6Q0Ed/RImUgYjgqBiWyFx2PvK8lKTSeLWYICNzVE1PhHbwsKRMKKjHFqfNf4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696311847; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=MlZSgA05hH7qPf957jWwZVxcYKRZwTchMmzmkdOAf7Q=; b=H2TkDvtUDXzvb6ic/IF+3iuci1CnXFUQJ4Q91jDVWGtdUegu1BCm0rpYtb+V5rNdNj0Sqd+/P90QlMB+OecM3tokF0kQ0b7e05mUKmQBcUfkfeROy7hEqOJID4JEjuJG78CiI5a1OR7+YmIhPlZVmnKClA14sO92VyAshoV7ums= 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 1696311847395350.2826716689607; Mon, 2 Oct 2023 22:44:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnYBw-0003lS-0e; Tue, 03 Oct 2023 01:43:32 -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 1qnYBu-0003lB-1I for qemu-devel@nongnu.org; Tue, 03 Oct 2023 01:43:30 -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 1qnYBs-00029Q-Eg for qemu-devel@nongnu.org; Tue, 03 Oct 2023 01:43:29 -0400 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-163-A53M04eTPx2aI8BJBrfCXA-1; Tue, 03 Oct 2023 01:43:20 -0400 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-4194d8856e0so8851811cf.0 for ; Mon, 02 Oct 2023 22:43:20 -0700 (PDT) Received: from localhost.localdomain ([115.96.159.31]) by smtp.googlemail.com with ESMTPSA id w7-20020a170902d3c700b001c42d4b3675sm467279plb.309.2023.10.02.22.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 22:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696311807; 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; bh=MlZSgA05hH7qPf957jWwZVxcYKRZwTchMmzmkdOAf7Q=; b=a+AnZTu+/53qd7U1lFUWYEkBsCJ3Yvah8kvInmAAc8ZaY37PDEORNHw+F+dfnMjYkKMs0W QixKNoUPTI3pBrnmnOAnGTm98EgOvcipnJ/df6fEj+EXb/pSlorUPswBXmaihtjLkzlzc+ Cu2usGOSptvZlBd0p75Oh5jSveihSFg= X-MC-Unique: A53M04eTPx2aI8BJBrfCXA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696311800; x=1696916600; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MlZSgA05hH7qPf957jWwZVxcYKRZwTchMmzmkdOAf7Q=; b=LJupVK/ZFkJjjPW6MFBd1BQTu6ZvLcLGIbEcQhSaw6KSZ5ShWKEmC80Hq6hEZCkfgT kW0I7I/UW9Tc9ER0PQHOjtOMmWNb7zzzty3j13Wl7ghLSE9MjOmh6sokpVxW2IvM5Rw6 yxdpuMSeN5PjROsESmuIqVtx/xEhVYoyb5cd08N4NSuJfykgP622wYGDgoiAqlSpumgt gkv+luqOXRADKMmRkZw4vtEnRDeAk0WaXWu8lGwh5S+PRs/3RUdamP0U1uGPu7K+otVI KUXwwSkaAUyMHQKtMFAS/HqkzM+Vy1qnL4oPs/G2UkQD2ABl/Efo9XdUi7/371RUI1W8 ocmg== X-Gm-Message-State: AOJu0Yzi8EXsEhXxkFaJFEdpj/dNHpQ5yuBcE75RLzf9xyArKBjhHa1d 9lkzLSWrcJWYwSYWVe8RICORyI/XPseNOeD25c+S6RkMKuCxL8d3Jrm01x4W82+X212i0AUDHNT saA21Y7gqfGkh0I0= X-Received: by 2002:ac8:7f88:0:b0:414:e458:ab0e with SMTP id z8-20020ac87f88000000b00414e458ab0emr14810238qtj.68.1696311799926; Mon, 02 Oct 2023 22:43:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDtFxxRXngmk0B/NkCXzOtK5J5sFdNo1nGXq/L20NGl78RbZ/XqLpZkmq5uMHWkJzAoA4AIA== X-Received: by 2002:ac8:7f88:0:b0:414:e458:ab0e with SMTP id z8-20020ac87f88000000b00414e458ab0emr14810222qtj.68.1696311799664; Mon, 02 Oct 2023 22:43:19 -0700 (PDT) From: Ani Sinha To: "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Peter Xu , Jason Wang Cc: Ani Sinha , Markus Armbruster , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2] hw/i386: changes towards enabling -Wshadow=local Date: Tue, 3 Oct 2023 11:13:06 +0530 Message-ID: <20231003054306.4372-1-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=anisinha@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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696311849723100003 Code changes that addresses all compiler complaints coming from enabling -Wshadow flags. Enabling -Wshadow catches cases of local variables shadowing other local variables or parameters. These makes the code confusing and/or = adds bugs that are difficult to catch. CC: Markus Armbruster CC: Philippe Mathieu-Daude CC: mst@redhat.com Message-Id: <87r0mqlf9x.fsf@pond.sub.org> Signed-off-by: Ani Sinha Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin --- hw/i386/acpi-microvm.c | 4 ++-- hw/i386/intel_iommu.c | 8 ++++---- hw/i386/pc.c | 1 - hw/i386/x86.c | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-) changelog: v2: addressed suggestion from mst. diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c index a075360d85..6ddcfb0419 100644 --- a/hw/i386/acpi-microvm.c +++ b/hw/i386/acpi-microvm.c @@ -55,8 +55,8 @@ static void acpi_dsdt_add_virtio(Aml *scope, =20 bus =3D sysbus_get_default(); QTAILQ_FOREACH(kid, &bus->children, sibling) { - DeviceState *dev =3D kid->child; - Object *obj =3D object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MMIO); + Object *obj =3D object_dynamic_cast(OBJECT(kid->child), + TYPE_VIRTIO_MMIO); =20 if (obj) { VirtIOMMIOProxy *mmio =3D VIRTIO_MMIO(obj); diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index c0ce896668..2c832ab68b 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3744,7 +3744,7 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, = PCIBus *bus, /* Unmap the whole range in the notifier's scope. */ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n) { - hwaddr size, remain; + hwaddr total, remain; hwaddr start =3D n->start; hwaddr end =3D n->end; IntelIOMMUState *s =3D as->iommu_state; @@ -3765,7 +3765,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *= as, IOMMUNotifier *n) } =20 assert(start <=3D end); - size =3D remain =3D end - start + 1; + total =3D remain =3D end - start + 1; =20 while (remain >=3D VTD_PAGE_SIZE) { IOMMUTLBEvent event; @@ -3793,10 +3793,10 @@ static void vtd_address_space_unmap(VTDAddressSpace= *as, IOMMUNotifier *n) trace_vtd_as_unmap_whole(pci_bus_num(as->bus), VTD_PCI_SLOT(as->devfn), VTD_PCI_FUNC(as->devfn), - n->start, size); + n->start, total); =20 map.iova =3D n->start; - map.size =3D size - 1; /* Inclusive */ + map.size =3D total - 1; /* Inclusive */ iova_tree_remove(as->iova_tree, map); } =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3db0743f31..e7a233e886 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1116,7 +1116,6 @@ void pc_memory_init(PCMachineState *pcms, =20 if (machine->device_memory) { uint64_t *val =3D g_malloc(sizeof(*val)); - PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); uint64_t res_mem_end =3D machine->device_memory->base; =20 if (!pcmc->broken_reserved_end) { diff --git a/hw/i386/x86.c b/hw/i386/x86.c index f034df8bf6..b3d054889b 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -365,8 +365,6 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, =20 cpu_slot =3D x86_find_cpu_slot(MACHINE(x86ms), cpu->apic_id, &idx); if (!cpu_slot) { - MachineState *ms =3D MACHINE(x86ms); - x86_topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids); error_setg(errp, "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" --=20 2.42.0