hw/i386: changes towards enabling -Wshadow=local for x86 machines

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. See also Subject: Help wanted for enabling -Wshadow=local Message-Id: <[email protected]> https://lore.kernel.org/qemu-devel/[email protected] CC: Markus Armbruster <[email protected]> CC: Philippe Mathieu-Daude <[email protected]> CC: [email protected] Signed-off-by: Ani Sinha <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Reviewed-by: Peter Xu <[email protected]> Message-ID: <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Markus Armbruster <[email protected]>
devos50 · Oct 6, 2023 · 3636367 · 3636367
1 parent 668a631
commit 3636367
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
@@ -55,8 +55,8 @@ static void acpi_dsdt_add_virtio(Aml *scope,
 
     bus = sysbus_get_default();
     QTAILQ_FOREACH(kid, &bus->children, sibling) {
-        DeviceState *dev = kid->child;
-        Object *obj = object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MMIO);
+        Object *obj = object_dynamic_cast(OBJECT(kid->child),
+                                          TYPE_VIRTIO_MMIO);
 
         if (obj) {
             VirtIOMMIOProxy *mmio = VIRTIO_MMIO(obj);

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
@@ -1049,7 +1049,6 @@ void pc_memory_init(PCMachineState *pcms,
 
     if (machine->device_memory) {
         uint64_t *val = g_malloc(sizeof(*val));
-        PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
         uint64_t res_mem_end = machine->device_memory->base;
 
         if (!pcmc->broken_reserved_end) {

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
@@ -365,8 +365,6 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
 
     cpu_slot = x86_find_cpu_slot(MACHINE(x86ms), cpu->apic_id, &idx);
     if (!cpu_slot) {
-        MachineState *ms = 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"