[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 47/56] intel_iommu: Fix shadow local variables on "size"
From: |
Markus Armbruster |
Subject: |
[PULL 47/56] intel_iommu: Fix shadow local variables on "size" |
Date: |
Fri, 29 Sep 2023 10:50:44 +0200 |
From: Peter Xu <peterx@redhat.com>
This patch fixes the warning of shadowed local variable:
../hw/i386/intel_iommu.c: In function ‘vtd_address_space_unmap’:
../hw/i386/intel_iommu.c:3773:18: warning: declaration of ‘size’ shadows a
previous local [-Wshadow=compatible-local]
3773 | uint64_t size = mask + 1;
| ^~~~
../hw/i386/intel_iommu.c:3747:12: note: shadowed declaration is here
3747 | hwaddr size, remain;
| ^~~~
Cc: Jason Wang <jasowang@redhat.com>
Cc: Eric Auger <eric.auger@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230922160410.138786-1-peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/i386/intel_iommu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 = n->start;
hwaddr end = n->end;
IntelIOMMUState *s = as->iommu_state;
@@ -3765,7 +3765,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *as,
IOMMUNotifier *n)
}
assert(start <= end);
- size = remain = end - start + 1;
+ total = remain = end - start + 1;
while (remain >= 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);
map.iova = n->start;
- map.size = size - 1; /* Inclusive */
+ map.size = total - 1; /* Inclusive */
iova_tree_remove(as->iova_tree, map);
}
--
2.41.0
- [PULL 22/56] util/vhost-user-server: Clean up local variable shadowing, (continued)
- [PULL 22/56] util/vhost-user-server: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 31/56] spapr: Clean up local variable shadowing in spapr_dt_cpus(), Markus Armbruster, 2023/09/29
- [PULL 45/56] aspeed/i3c: Rename variable shadowing a local, Markus Armbruster, 2023/09/29
- [PULL 05/56] block/vdi: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 11/56] target/mips: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 15/56] hw/arm/virt: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 09/56] target/arm/tcg: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 04/56] block/dirty-bitmap: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 02/56] migration: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 49/56] seccomp: avoid shadowing of 'action' variable, Markus Armbruster, 2023/09/29
- [PULL 47/56] intel_iommu: Fix shadow local variables on "size",
Markus Armbruster <=
- [PULL 12/56] target/m68k: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 34/56] spapr/drc: Clean up local variable shadowing in rtas_ibm_configure_connector(), Markus Armbruster, 2023/09/29
- [PULL 38/56] hw/acpi: changes towards enabling -Wshadow=local, Markus Armbruster, 2023/09/29
- [PULL 32/56] spapr: Clean up local variable shadowing in spapr_init_cpus(), Markus Armbruster, 2023/09/29
- [PULL 23/56] linux-user/strace: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 13/56] target/tricore: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 17/56] hw/m68k: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 25/56] softmmu/memory: Clean up local variable shadowing, Markus Armbruster, 2023/09/29