From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adIbp-0007Ac-7V for qemu-devel@nongnu.org; Tue, 08 Mar 2016 09:27:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adIbk-0005vB-En for qemu-devel@nongnu.org; Tue, 08 Mar 2016 09:27:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adIbk-0005v0-9b for qemu-devel@nongnu.org; Tue, 08 Mar 2016 09:27:32 -0500 From: Gerd Hoffmann Date: Tue, 8 Mar 2016 15:27:23 +0100 Message-Id: <1457447247-4865-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1457447247-4865-1-git-send-email-kraxel@redhat.com> References: <1457447247-4865-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v4 4/8] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kevin.tian@intel.com, Alex Williamson , Stefano Stabellini Cc: igvt-g@ml01.01.org, xen-devel@lists.xensource.com, Gerd Hoffmann , "open list:All patches CC here" Signed-off-by: Gerd Hoffmann --- hw/pci-host/igd.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/igd.c b/hw/pci-host/igd.c index 93b86ca..3654298 100644 --- a/hw/pci-host/igd.c +++ b/hw/pci-host/igd.c @@ -56,12 +56,32 @@ out: return ret; } +#define IGD_PT_I440FX_CLASS(class) \ + OBJECT_CLASS_CHECK(IGDPtI440fxClass, (class), \ + TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE) +#define IGD_PT_I440FX_GET_CLASS(obj) \ + OBJECT_GET_CLASS(IGDPtI440fxClass, (obj), \ + TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE) + +typedef struct IGDPtI440fxClass { + PCIDeviceClass parent_class; + void (*parent_realize)(PCIDevice *dev, Error **errp); +} IGDPtI440fxClass; + static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) { + IGDPtI440fxClass *k = IGD_PT_I440FX_GET_CLASS(pci_dev); + Error *err = NULL; uint32_t val = 0; int rc, i, num; int pos, len; + k->parent_realize(pci_dev, &err); + if (err != NULL) { + error_propagate(errp, err); + return; + } + num = ARRAY_SIZE(igd_host_bridge_infos); for (i = 0; i < num; i++) { pos = igd_host_bridge_infos[i].offset; @@ -77,17 +97,20 @@ static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) { + IGDPtI440fxClass *k = IGD_PT_I440FX_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + PCIDeviceClass *pc = PCI_DEVICE_CLASS(klass); - k->realize = igd_pt_i440fx_realize; - dc->desc = "IGD Passthrough Host bridge"; + k->parent_realize = pc->realize; + pc->realize = igd_pt_i440fx_realize; + dc->desc = "IGD Passthrough Host bridge (i440fx)"; } static const TypeInfo igd_passthrough_i440fx_info = { .name = TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, .parent = TYPE_I440FX_PCI_DEVICE, .class_init = igd_passthrough_i440fx_class_init, + .class_size = sizeof(IGDPtI440fxClass), }; static void igd_register_types(void) -- 1.8.3.1