From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm77l-0007ov-46 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:29:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm77e-0007bY-7u for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:29:14 -0400 Received: from [199.232.76.173] (port=49836 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm77e-0007b7-0R for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:29:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64187) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm6tk-0001S4-FA for qemu-devel@nongnu.org; Fri, 11 Sep 2009 10:14:49 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8BEEXJ0008643 for ; Fri, 11 Sep 2009 10:14:34 -0400 Subject: Re: [Qemu-devel] [PATCH 1/8] qdev/pci: add pci_create_noinit() References: <1252672351-12937-1-git-send-email-kraxel@redhat.com> <1252672351-12937-2-git-send-email-kraxel@redhat.com> From: Markus Armbruster Date: Fri, 11 Sep 2009 16:14:31 +0200 In-Reply-To: <1252672351-12937-2-git-send-email-kraxel@redhat.com> (Gerd Hoffmann's message of "Fri\, 11 Sep 2009 14\:32\:24 +0200") Message-ID: <87ws45d0vs.fsf@pike.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Gerd Hoffmann writes: > Like pci_create_simple() but doesn't call qdev_init(), so one can > set properties before initializing the device. > > Signed-off-by: Gerd Hoffmann > --- > 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 c12b0be..64d70ed 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); > +} Okay, this is qdev_create() specialized for PCI. What about calling it just pci_create()? > > - 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 6196b6a..e7bf33a 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 */