[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] igd: add q35 support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/7] igd: add q35 support |
Date: |
Tue, 8 Dec 2015 15:07:28 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci-host/igd.c | 41 ++++++++++++++++++++++++++++++++++++++++-
hw/pci-host/q35.c | 6 +++++-
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/igd.c b/hw/pci-host/igd.c
index ec48875..f6e3f7a 100644
--- a/hw/pci-host/igd.c
+++ b/hw/pci-host/igd.c
@@ -1,5 +1,6 @@
#include "qemu-common.h"
#include "hw/pci/pci.h"
+#include "hw/pci-host/q35.h"
#include "hw/i386/pc.h"
/* IGD Passthrough Host Bridge. */
@@ -76,7 +77,7 @@ static void igd_passthrough_i440fx_class_init(ObjectClass
*klass, void *data)
i440fx_realize = k->realize;
k->realize = igd_pt_i440fx_realize;
- dc->desc = "IGD Passthrough Host bridge";
+ dc->desc = "IGD Passthrough Host bridge (i440fx)";
}
static const TypeInfo igd_passthrough_i440fx_info = {
@@ -85,9 +86,47 @@ static const TypeInfo igd_passthrough_i440fx_info = {
.class_init = igd_passthrough_i440fx_class_init,
};
+static void (*q35_realize)(PCIDevice *pci_dev, Error **errp);
+static void igd_pt_q35_realize(PCIDevice *pci_dev, Error **errp)
+{
+ Error *err = NULL;
+
+ q35_realize(pci_dev, &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ host_pci_config_copy(pci_dev, "0000:00:00.0",
+ igd_host_bridge_infos,
+ ARRAY_SIZE(igd_host_bridge_infos),
+ &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+}
+
+static void igd_passthrough_q35_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+ q35_realize = k->realize;
+ k->realize = igd_pt_q35_realize;
+ dc->desc = "IGD Passthrough Host bridge (q35)";
+}
+
+static const TypeInfo igd_passthrough_q35_info = {
+ .name = "igd-passthrough-q35-mch",
+ .parent = TYPE_MCH_PCI_DEVICE,
+ .class_init = igd_passthrough_q35_class_init,
+};
+
static void igd_register_types(void)
{
type_register_static(&igd_passthrough_i440fx_info);
+ type_register_static(&igd_passthrough_q35_info);
}
type_init(igd_register_types)
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 1fb4707..07dc595 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -151,7 +151,11 @@ static void q35_host_initfn(Object *obj)
memory_region_init_io(&phb->data_mem, obj, &pci_host_data_le_ops, phb,
"pci-conf-data", 4);
- object_initialize(&s->mch, sizeof(s->mch), TYPE_MCH_PCI_DEVICE);
+ if (object_property_get_bool(qdev_get_machine(), "igd-passthru", NULL)) {
+ object_initialize(&s->mch, sizeof(s->mch), "igd-passthrough-q35-mch");
+ } else {
+ object_initialize(&s->mch, sizeof(s->mch), TYPE_MCH_PCI_DEVICE);
+ }
object_property_add_child(OBJECT(s), "mch", OBJECT(&s->mch), NULL);
qdev_prop_set_uint32(DEVICE(&s->mch), "addr", PCI_DEVFN(0, 0));
qdev_prop_set_bit(DEVICE(&s->mch), "multifunction", false);
--
1.8.3.1
- [Qemu-devel] [PATCH 0/7] igd passthrough chipset tweaks, Gerd Hoffmann, 2015/12/08
- [Qemu-devel] [PATCH 2/7] pc: move igd support code to igd.c, Gerd Hoffmann, 2015/12/08
- [Qemu-devel] [PATCH 4/7] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize, Gerd Hoffmann, 2015/12/08
- [Qemu-devel] [PATCH 3/7] igd: switch TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE to realize, Gerd Hoffmann, 2015/12/08
- [Qemu-devel] [PATCH 1/7] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen, Gerd Hoffmann, 2015/12/08
- [Qemu-devel] [PATCH 7/7] igd: add q35 support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 6/7] igd: revamp host config read, Gerd Hoffmann, 2015/12/08
- [Qemu-devel] [PATCH 5/7] igd: use defines for standard pci config space offsets, Gerd Hoffmann, 2015/12/08
- Re: [Qemu-devel] [PATCH 0/7] igd passthrough chipset tweaks, Stefano Stabellini, 2015/12/11