From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyGx-0005Iq-4o for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyGr-0002kc-GU for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyGr-0002kW-B9 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:33 -0400 Date: Fri, 29 Jul 2016 06:15:28 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-9-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 08/41] apb: convert init to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Wei Jiangang , Markus Armbruster , Marcel Apfelbaum , Cao jin From: Wei Jiangang Convert a device model where initialization obviously can't fail, make it implement realize() rather than init(). Signed-off-by: Wei Jiangang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Markus Armbruster --- hw/pci-host/apb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 16587f8..653e711 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -634,7 +634,7 @@ static void pci_apb_set_irq(void *opaque, int irq_num, int level) } } -static int apb_pci_bridge_initfn(PCIDevice *dev) +static void apb_pci_bridge_realize(PCIDevice *dev, Error **errp) { pci_bridge_initfn(dev, TYPE_PCI_BUS); @@ -652,7 +652,6 @@ static int apb_pci_bridge_initfn(PCIDevice *dev) pci_set_word(dev->config + PCI_STATUS, PCI_STATUS_FAST_BACK | PCI_STATUS_66MHZ | PCI_STATUS_DEVSEL_MEDIUM); - return 0; } PCIBus *pci_apb_init(hwaddr special_base, @@ -843,7 +842,7 @@ static void pbm_pci_bridge_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = apb_pci_bridge_initfn; + k->realize = apb_pci_bridge_realize; k->exit = pci_bridge_exitfn; k->vendor_id = PCI_VENDOR_ID_SUN; k->device_id = PCI_DEVICE_ID_SUN_SIMBA; -- MST