| Message ID | 20231003102803.6163-1-anisinha@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] hw/i386: changes towards enabling -Wshadow=local for x86 machines | expand |
On Tue, Oct 03, 2023 at 03:58:02PM +0530, Ani Sinha wrote: > 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: <87r0mqlf9x.fsf@pond.sub.org> > https://lore.kernel.org/qemu-devel/87r0mqlf9x.fsf@pond.sub.org > > CC: Markus Armbruster <armbru@redhat.com> > CC: Philippe Mathieu-Daude <philmd@linaro.org> > CC: mst@redhat.com > > Signed-off-by: Ani Sinha <anisinha@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/i386/acpi-microvm.c | 4 ++-- > hw/i386/pc.c | 1 - > hw/i386/x86.c | 2 -- > 3 files changed, 2 insertions(+), 5 deletions(-) > > changelog: > v3: split the patches. Peter's changes are now in a seperate patch. > Addressed mst's suggestions. Removed message-ID > from commit log and added the reference to previous discussion thread > explicitly. > v2: kept Peter's changes from https://lore.kernel.org/r/20230922160410.138786-1-peterx@redhat.com > and removed mine. > > 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, > > 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 > index 3db0743f31..e7a233e886 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1116,7 +1116,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 > 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, > > 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" > -- > 2.42.0
Ani Sinha <anisinha@redhat.com> writes: > 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: <87r0mqlf9x.fsf@pond.sub.org> > https://lore.kernel.org/qemu-devel/87r0mqlf9x.fsf@pond.sub.org > > CC: Markus Armbruster <armbru@redhat.com> > CC: Philippe Mathieu-Daude <philmd@linaro.org> > CC: mst@redhat.com > > Signed-off-by: Ani Sinha <anisinha@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Reviewed-by: Peter Xu <peterx@redhat.com> Queued. Thanks!
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, 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 index 3db0743f31..e7a233e886 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1116,7 +1116,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 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, 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"