[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/24] inplace allocation for pci, split irq init.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/24] inplace allocation for pci, split irq init. |
Date: |
Fri, 25 Sep 2009 21:42:31 +0200 |
This patch allows carrying the pcibus struct inplace. Separate
allocation is possible as well. It also splits pci_register_bus into
two parts (irq setup is separate now).
Followup patches will use this.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci.c | 43 +++++++++++++++++++++++++++++++++----------
hw/pci.h | 5 +++++
2 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 64d70ed..ad508a5 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -98,24 +98,47 @@ static void pci_bus_reset(void *opaque)
}
}
-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)
+void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
+ const char *name, int devfn_min)
{
- PCIBus *bus;
static int nbus = 0;
- bus = FROM_QBUS(PCIBus, qbus_create(&pci_bus_info, parent, name));
- bus->set_irq = set_irq;
- bus->map_irq = map_irq;
- bus->irq_opaque = irq_opaque;
+ qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name);
bus->devfn_min = devfn_min;
- bus->nirq = nirq;
- bus->irq_count = qemu_mallocz(nirq * sizeof(bus->irq_count[0]));
bus->next = first_bus;
first_bus = bus;
vmstate_register(nbus++, &vmstate_pcibus, bus);
qemu_register_reset(pci_bus_reset, bus);
+}
+
+PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min)
+{
+ PCIBus *bus;
+
+ bus = qemu_mallocz(sizeof(*bus));
+ bus->qbus.qdev_allocated = 1;
+ pci_bus_new_inplace(bus, parent, name, devfn_min);
+ return bus;
+}
+
+void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
+ void *irq_opaque, int nirq)
+{
+ bus->set_irq = set_irq;
+ bus->map_irq = map_irq;
+ bus->irq_opaque = irq_opaque;
+ bus->nirq = nirq;
+ bus->irq_count = qemu_mallocz(nirq * sizeof(bus->irq_count[0]));
+}
+
+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)
+{
+ PCIBus *bus;
+
+ bus = pci_bus_new(parent, name, devfn_min);
+ pci_bus_irqs(bus, set_irq, map_irq, irq_opaque, nirq);
return bus;
}
diff --git a/hw/pci.h b/hw/pci.h
index caba5c8..2b6a0f2 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -248,6 +248,11 @@ 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);
+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);
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.2.5
- [Qemu-devel] [PATCH 00/24] qdev: bus management updates., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 01/24] unbreak usb pass-through on linux., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 05/24] switch ide bus to inplace allocation., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 04/24] switch usb bus to inplace allocation., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 03/24] switch scsi bus to inplace allocation., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 06/24] inplace allocation for pci, split irq init.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 02/24] allow qdev busses allocations be inplace, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 08/24] piix_pci: kill PIIX3IrqState, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 10/24] Add exit callback to DeviceInfo., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 12/24] pci: use qdev for device destruction., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 07/24] convert pci bridge to qdev, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 13/24] pci: move unregister from PCIDevice to PCIDeviceInfo, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 11/24] Implement scsi device destruction, Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 09/24] qdev: device free fixups., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 14/24] usb: hook unplug into qdev, cleanups + fixes., Gerd Hoffmann, 2009/09/25
- [Qemu-devel] [PATCH 17/24] usb: hotplug windup, Gerd Hoffmann, 2009/09/25