From 71077c1cb07c9c73ec279c119d526d2600132ac9 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 15 Sep 2009 19:23:25 +0000 Subject: [PATCH] qdev/pci: add pci_create_noinit() Like pci_create_simple() but doesn't call qdev_init(), so one can set properties before initializing the device. Signed-off-by: Gerd Hoffmann Signed-off-by: Blue Swirl --- hw/pci.c | 11 ++++++++--- hw/pci.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index c12b0beaae..64d70ed237 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -923,15 +923,20 @@ void pci_qdev_register_many(PCIDeviceInfo *info) } } -PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) +PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name) { DeviceState *dev; dev = qdev_create(&bus->qbus, name); qdev_prop_set_uint32(dev, "addr", devfn); - qdev_init(dev); + return DO_UPCAST(PCIDevice, qdev, dev); +} - return (PCIDevice *)dev; +PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) +{ + PCIDevice *dev = pci_create_noinit(bus, devfn, name); + qdev_init(&dev->qdev); + return dev; } static int pci_find_space(PCIDevice *pdev, uint8_t size) diff --git a/hw/pci.h b/hw/pci.h index 6196b6ab38..e7bf33aef0 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -328,6 +328,7 @@ void pci_qdev_register(PCIDeviceInfo *info); void pci_qdev_register_many(PCIDeviceInfo *info); PCIDevice *pci_create(const char *name, const char *devaddr); +PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name); PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); /* lsi53c895a.c */