Add argument, DeviceState*, to pci hot plug callback. The argument will be used later to remove global variable.
Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp> Acked-by: Gerd Hoffmann <kra...@redhat.com> --- changes v10 -> v11: - change callback argument from void* to DeviceState*. --- hw/acpi_piix4.c | 6 +++--- hw/pci.c | 8 +++++--- hw/pci.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index f06f257..574392e 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -562,7 +562,7 @@ static void pciej_write(void *opaque, uint32_t addr, uint32_t val) #endif } -static int piix4_device_hotplug(PCIDevice *dev, int state); +static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state); void piix4_acpi_system_hot_add_init(PCIBus *bus) { @@ -575,7 +575,7 @@ void piix4_acpi_system_hot_add_init(PCIBus *bus) register_ioport_write(PCI_EJ_BASE, 4, 4, pciej_write, bus); register_ioport_read(PCI_EJ_BASE, 4, 4, pciej_read, bus); - pci_bus_hotplug(bus, piix4_device_hotplug); + pci_bus_hotplug(bus, piix4_device_hotplug, NULL); } static void enable_device(struct pci_status *p, struct gpe_regs *g, int slot) @@ -590,7 +590,7 @@ static void disable_device(struct pci_status *p, struct gpe_regs *g, int slot) p->down |= (1 << slot); } -static int piix4_device_hotplug(PCIDevice *dev, int state) +static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state) { int slot = PCI_SLOT(dev->devfn); diff --git a/hw/pci.c b/hw/pci.c index 0814383..7b6b02d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -41,6 +41,7 @@ struct PCIBus { pci_set_irq_fn set_irq; pci_map_irq_fn map_irq; pci_hotplug_fn hotplug; + DeviceState *hotplug_qdev; uint32_t config_reg; /* XXX: suppress */ void *irq_opaque; PCIDevice *devices[256]; @@ -232,10 +233,11 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, bus->irq_count = qemu_mallocz(nirq * sizeof(bus->irq_count[0])); } -void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug) +void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *qdev) { bus->qbus.allow_hotplug = 1; bus->hotplug = hotplug; + bus->hotplug_qdev = qdev; } void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base) @@ -1384,7 +1386,7 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) pci_add_option_rom(pci_dev); if (qdev->hotplugged) - bus->hotplug(pci_dev, 1); + bus->hotplug(bus->hotplug_qdev, pci_dev, 1); return 0; } @@ -1392,7 +1394,7 @@ static int pci_unplug_device(DeviceState *qdev) { PCIDevice *dev = DO_UPCAST(PCIDevice, qdev, qdev); - dev->bus->hotplug(dev, 0); + dev->bus->hotplug(dev->bus->hotplug_qdev, dev, 0); return 0; } diff --git a/hw/pci.h b/hw/pci.h index fd16460..79b198a 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -273,13 +273,13 @@ int pci_device_load(PCIDevice *s, QEMUFile *f); typedef void (*pci_set_irq_fn)(void *opaque, int irq_num, int level); typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num); -typedef int (*pci_hotplug_fn)(PCIDevice *pci_dev, int state); +typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, int state); void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, const char *name, int devfn_min); PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min); void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int nirq); -void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug); +void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *dev); PCIBus *pci_register_bus(DeviceState *parent, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, void *irq_opaque, int devfn_min, int nirq); -- 1.6.5.4