diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-10-09 10:13:41 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-10-19 23:13:28 +0200 |
| commit | 305ab2b9716551e486cbdcff111610a2cf8da095 (patch) | |
| tree | 21fc5ab194033ea0a7379db5392a9f2cb93103d1 | |
| parent | 4aa07e864911b77dc7fb4704554bb041776b8ec7 (diff) | |
| download | qemu-305ab2b9716551e486cbdcff111610a2cf8da095.zip qemu-305ab2b9716551e486cbdcff111610a2cf8da095.tar.gz qemu-305ab2b9716551e486cbdcff111610a2cf8da095.tar.bz2 | |
hw/acpi/pcihp: Clean up global variable shadowing in acpi_pcihp_init()
Fix:
hw/acpi/pcihp.c:499:36: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
MemoryRegion *address_space_io,
^
include/exec/address-spaces.h:35:21: note: previous declaration is here
extern AddressSpace address_space_io;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231010115048.11856-5-philmd@linaro.org>
| -rw-r--r-- | hw/acpi/pcihp.c | 5 | ||||
| -rw-r--r-- | include/hw/acpi/pcihp.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index cdd6f77..4f75c87 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -496,8 +496,7 @@ static const MemoryRegionOps acpi_pcihp_io_ops = { }; void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, - MemoryRegion *address_space_io, - uint16_t io_base) + MemoryRegion *io, uint16_t io_base) { s->io_len = ACPI_PCIHP_SIZE; s->io_base = io_base; @@ -506,7 +505,7 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s, "acpi-pci-hotplug", s->io_len); - memory_region_add_subregion(address_space_io, s->io_base, &s->io); + memory_region_add_subregion(io, s->io_base, &s->io); object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base, OBJ_PROP_FLAG_READ); diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index ef59810..ac21a95 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -56,7 +56,7 @@ typedef struct AcpiPciHpState { } AcpiPciHpState; void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root, - MemoryRegion *address_space_io, uint16_t io_base); + MemoryRegion *io, uint16_t io_base); bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus); void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev, |