From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afPqu-0005SZ-9O for qemu-devel@nongnu.org; Mon, 14 Mar 2016 06:35:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afPqs-0000jT-9z for qemu-devel@nongnu.org; Mon, 14 Mar 2016 06:35:56 -0400 Received: from [59.151.112.132] (port=16544 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afPqr-0000iW-U4 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 06:35:54 -0400 From: Wei Jiangang Date: Mon, 14 Mar 2016 18:35:04 +0800 Message-ID: <1457951704-5217-4-git-send-email-weijg.fnst@cn.fujitsu.com> In-Reply-To: <1457951704-5217-1-git-send-email-weijg.fnst@cn.fujitsu.com> References: <1457951704-5217-1-git-send-email-weijg.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 3/3] pxb-pcie: convert to realize() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, caoj.fnst@cn.fujitsu.com, Wei Jiangang , ehabkost@redhat.com, mst@redhat.com Signed-off-by: Wei Jiangang Signed-off-by: Cao jin --- hw/pci-bridge/pci_expander_bridge.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index cc5074d..64267d8 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -314,22 +314,14 @@ static const TypeInfo pxb_dev_info = { .class_init = pxb_dev_class_init, }; -static int pxb_pcie_dev_initfn(PCIDevice *dev) +static void pxb_pcie_dev_realize(PCIDevice *dev, Error **errp) { - Error *err = NULL; - if (!pci_bus_is_express(dev->bus)) { - error_report("pxb-pcie devices cannot reside on a PCI bus!"); - return -EINVAL; - } - - pxb_dev_realize_common(dev, true, &err); - if (err) { - error_report_err(err); - return -EINVAL; + error_setg(errp, "pxb-pcie devices cannot reside on a PCI bus!"); + return; } - return 0; + pxb_dev_realize_common(dev, true, errp); } static void pxb_pcie_dev_class_init(ObjectClass *klass, void *data) @@ -337,7 +329,7 @@ static void pxb_pcie_dev_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = pxb_pcie_dev_initfn; + k->realize = pxb_pcie_dev_realize; k->exit = pxb_dev_exitfn; k->vendor_id = PCI_VENDOR_ID_REDHAT; k->device_id = PCI_DEVICE_ID_REDHAT_PXB_PCIE; -- 1.9.3