From patchwork Tue Jan 5 11:41:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 563049 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 52D69140324 for ; Tue, 5 Jan 2016 22:47:15 +1100 (AEDT) Received: from localhost ([::1]:49100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGQ53-0004vK-1A for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2016 06:47:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGQ06-0004Ci-Eg for qemu-devel@nongnu.org; Tue, 05 Jan 2016 06:42:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGQ02-0003Y0-0X for qemu-devel@nongnu.org; Tue, 05 Jan 2016 06:42:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGQ01-0003XN-PE for qemu-devel@nongnu.org; Tue, 05 Jan 2016 06:42:01 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 58488CEC9; Tue, 5 Jan 2016 11:42:01 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u05Bfxcs024177; Tue, 5 Jan 2016 06:42:00 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id B0B3680DDD; Tue, 5 Jan 2016 12:41:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 5 Jan 2016 12:41:35 +0100 Message-Id: <1451994098-6972-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1451994098-6972-1-git-send-email-kraxel@redhat.com> References: <1451994098-6972-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: igvt-g@ml01.01.org, xen-devel@lists.xensource.com, Eduardo Habkost , Stefano Stabellini , "Michael S. Tsirkin" , Cao jin , vfio-users@redhat.com, Gerd Hoffmann Subject: [Qemu-devel] [PATCH v3 08/11] igd: add q35 support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- 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);