motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-18 15:42:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/pci: Clean up global variable shadowing of address_space_io variable

Browse source 
Fix:

  hw/pci/pci.c:504:54: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
                                         MemoryRegion *address_space_io,
                                                       ^
  hw/pci/pci.c:533:38: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
                         MemoryRegion *address_space_io,
                                       ^
  hw/pci/pci.c:543:40: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
                           MemoryRegion *address_space_io,
                                         ^
  hw/pci/pci.c:590:45: 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>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231010115048.11856-6-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-09 09:33:29 +02:00
parent 305ab2b971
commit 49909a0d03
2 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
hw/pci/pci.c
View file

@ -500,15 +500,14 @@ bool pci_bus_bypass_iommu(PCIBus *bus)
} }
static void pci_root_bus_internal_init(PCIBus *bus, DeviceState *parent, static void pci_root_bus_internal_init(PCIBus *bus, DeviceState *parent,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min) uint8_t devfn_min)
{ {
assert(PCI_FUNC(devfn_min) == 0); assert(PCI_FUNC(devfn_min) == 0);
bus->devfn_min = devfn_min; bus->devfn_min = devfn_min;
bus->slot_reserved_mask = 0x0; bus->slot_reserved_mask = 0x0;
bus->address_space_mem = address_space_mem; bus->address_space_mem = mem;
bus->address_space_io = address_space_io; bus->address_space_io = io;
bus->flags |= PCI_BUS_IS_ROOT; bus->flags |= PCI_BUS_IS_ROOT;
/* host bridge */ /* host bridge */
@ -529,25 +528,21 @@ bool pci_bus_is_express(const PCIBus *bus)
void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent, void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent,
const char *name, const char *name,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min, const char *typename) uint8_t devfn_min, const char *typename)
{ {
qbus_init(bus, bus_size, typename, parent, name); qbus_init(bus, bus_size, typename, parent, name);
pci_root_bus_internal_init(bus, parent, address_space_mem, pci_root_bus_internal_init(bus, parent, mem, io, devfn_min);
address_space_io, devfn_min);
} }
PCIBus *pci_root_bus_new(DeviceState *parent, const char *name, PCIBus *pci_root_bus_new(DeviceState *parent, const char *name,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min, const char *typename) uint8_t devfn_min, const char *typename)
{ {
PCIBus *bus; PCIBus *bus;
bus = PCI_BUS(qbus_new(typename, parent, name)); bus = PCI_BUS(qbus_new(typename, parent, name));
pci_root_bus_internal_init(bus, parent, address_space_mem, pci_root_bus_internal_init(bus, parent, mem, io, devfn_min);
address_space_io, devfn_min);
return bus; return bus;
} }
@ -586,15 +581,13 @@ void pci_bus_irqs_cleanup(PCIBus *bus)
PCIBus *pci_register_root_bus(DeviceState *parent, const char *name, PCIBus *pci_register_root_bus(DeviceState *parent, const char *name,
pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
void *irq_opaque, void *irq_opaque,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min, int nirq, uint8_t devfn_min, int nirq,
const char *typename) const char *typename)
{ {
PCIBus *bus; PCIBus *bus;
bus = pci_root_bus_new(parent, name, address_space_mem, bus = pci_root_bus_new(parent, name, mem, io, devfn_min, typename);
address_space_io, devfn_min, typename);
pci_bus_irqs(bus, set_irq, irq_opaque, nirq); pci_bus_irqs(bus, set_irq, irq_opaque, nirq);
pci_bus_map_irqs(bus, map_irq); pci_bus_map_irqs(bus, map_irq);
return bus; return bus;

9
include/hw/pci/pci.h
View file

@ -279,12 +279,10 @@ bool pci_bus_is_express(const PCIBus *bus);
void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent, void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent,
const char *name, const char *name,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min, const char *typename); uint8_t devfn_min, const char *typename);
PCIBus *pci_root_bus_new(DeviceState *parent, const char *name, PCIBus *pci_root_bus_new(DeviceState *parent, const char *name,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min, const char *typename); uint8_t devfn_min, const char *typename);
void pci_root_bus_cleanup(PCIBus *bus); void pci_root_bus_cleanup(PCIBus *bus);
void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq,
@ -304,8 +302,7 @@ int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int pin);
PCIBus *pci_register_root_bus(DeviceState *parent, const char *name, PCIBus *pci_register_root_bus(DeviceState *parent, const char *name,
pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
void *irq_opaque, void *irq_opaque,
MemoryRegion *address_space_mem, MemoryRegion *mem, MemoryRegion *io,
MemoryRegion *address_space_io,
uint8_t devfn_min, int nirq, uint8_t devfn_min, int nirq,
const char *typename); const char *typename);
void pci_unregister_root_bus(PCIBus *bus); void pci_unregister_root_bus(PCIBus *bus);