From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2c6l-0007uT-EL for qemu-devel@nongnu.org; Tue, 17 May 2016 06:20:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2c6h-0001zL-Dp for qemu-devel@nongnu.org; Tue, 17 May 2016 06:20:11 -0400 Received: from [59.151.112.132] (port=39931 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2c6g-0001wV-9D for qemu-devel@nongnu.org; Tue, 17 May 2016 06:20:07 -0400 From: Wei Jiangang Date: Tue, 17 May 2016 18:18:47 +0800 Message-ID: <1463480327-3198-3-git-send-email-weijg.fnst@cn.fujitsu.com> In-Reply-To: <1463480327-3198-1-git-send-email-weijg.fnst@cn.fujitsu.com> References: <1463480327-3198-1-git-send-email-weijg.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 2/2] apb: convert init to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, armbru@redhat.com, marcel@redhat.com, Wei Jiangang Convert a device model where initialization obviously can't fail, make it implement realize() rather than init(). Signed-off-by: Wei Jiangang --- 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 aaef7bb..b29789c 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -633,7 +633,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); @@ -651,7 +651,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; -- 1.9.3