From: Gerd Hoffmann <kraxel@redhat.com> To: kevin.tian@intel.com, Alex Williamson <alex.williamson@redhat.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: igvt-g@ml01.01.org, xen-devel@lists.xensource.com, Gerd Hoffmann <kraxel@redhat.com>, "open list:All patches CC here" <qemu-devel@nongnu.org> Subject: [Qemu-devel] [PATCH v4 4/8] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize Date: Tue, 8 Mar 2016 15:27:23 +0100 [thread overview] Message-ID: <1457447247-4865-5-git-send-email-kraxel@redhat.com> (raw) In-Reply-To: <1457447247-4865-1-git-send-email-kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Gerd Hoffmann <kraxel@redhat.com> To: kevin.tian@intel.com, Alex Williamson <alex.williamson@redhat.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: igvt-g@ml01.01.org, xen-devel@lists.xensource.com, Gerd Hoffmann <kraxel@redhat.com>, "open list:All patches CC here" <qemu-devel@nongnu.org> Subject: [PATCH v4 4/8] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize Date: Tue, 8 Mar 2016 15:27:23 +0100 [thread overview] Message-ID: <1457447247-4865-5-git-send-email-kraxel@redhat.com> (raw) In-Reply-To: <1457447247-4865-1-git-send-email-kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-08 14:27 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-08 14:27 [PATCH v4 0/8] igd passthrough chipset tweaks Gerd Hoffmann 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 1/8] pc: remove has_igd_gfx_passthru global Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 2/8] pc: move igd support code to igd.c Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann 2016-03-09 15:08 ` [Qemu-devel] " Gerd Hoffmann 2016-03-09 15:08 ` Gerd Hoffmann 2016-03-10 5:56 ` [Qemu-devel] " Tian, Kevin 2016-03-10 5:56 ` Tian, Kevin 2016-03-10 17:51 ` [Qemu-devel] " Kay, Allen M 2016-03-10 17:51 ` Kay, Allen M 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 3/8] igd: switch TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE to realize Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann [this message] 2016-03-08 14:27 ` [PATCH v4 4/8] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize Gerd Hoffmann 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 5/8] igd: use defines for standard pci config space offsets Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 6/8] igd: revamp host config read Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 7/8] igd: move igd-passthrough-isa-bridge to igd.c too Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann 2016-03-08 14:27 ` [Qemu-devel] [PATCH v4 8/8] igd: handle igd-passthrough-isa-bridge setup in realize() Gerd Hoffmann 2016-03-08 14:27 ` Gerd Hoffmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1457447247-4865-5-git-send-email-kraxel@redhat.com \ --to=kraxel@redhat.com \ --cc=alex.williamson@redhat.com \ --cc=igvt-g@ml01.01.org \ --cc=kevin.tian@intel.com \ --cc=qemu-devel@nongnu.org \ --cc=stefano.stabellini@eu.citrix.com \ --cc=xen-devel@lists.xensource.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.