From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ablJC-0003cN-G7 for qemu-devel@nongnu.org; Fri, 04 Mar 2016 03:42:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ablJ9-00051J-8s for qemu-devel@nongnu.org; Fri, 04 Mar 2016 03:42:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41515) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ablJ9-000516-4N for qemu-devel@nongnu.org; Fri, 04 Mar 2016 03:41:59 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id BD42772081 for ; Fri, 4 Mar 2016 08:41:58 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 4 Mar 2016 09:41:53 +0100 Message-Id: <1457080913-30018-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2] vfio/igd: handle q35 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alex Williamson , Gerd Hoffmann Basically skip the lpc quirks with -M q35. Applies on top of the vfio-igd patch series by alex. Signed-off-by: Gerd Hoffmann --- hw/vfio/pci-quirks.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 5828362..1757e3d 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/nvram/fw_cfg.h" +#include "hw/i386/ich9.h" #include "pci.h" #include "trace.h" #include "qemu/range.h" @@ -1410,6 +1411,7 @@ int vfio_pci_igd_lpc_init(VFIOPCIDevice *vdev, struct vfio_region_info *region) { DeviceClass *dc = DEVICE_GET_CLASS(vdev); + PCIBus *bus; PCIDevice *lpc_bridge; int ret; @@ -1423,6 +1425,19 @@ int vfio_pci_igd_lpc_init(VFIOPCIDevice *vdev, dc->hotpluggable = false; + bus = pci_device_root_bus(&vdev->pdev); + lpc_bridge = pci_find_device(bus, 0, PCI_DEVFN(0x1f, 0)); + if (lpc_bridge) { + const char *type = object_get_typename(OBJECT(lpc_bridge)); + if (strcmp(type, TYPE_ICH9_LPC_DEVICE) == 0) { + /* + * q35 lpc present, leave it as-is. + * linux kernel 4.5+ can deal with this. + */ + return 0; + } + } + lpc_bridge = pci_create_simple(pci_device_root_bus(&vdev->pdev), PCI_DEVFN(0x1f, 0), "vfio-pci-igd-lpc-bridge"); -- 1.8.3.1