{"id":819288,"url":"http://patchwork.ozlabs.org/api/patches/819288/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170927195635.16014-3-ehabkost@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170927195635.16014-3-ehabkost@redhat.com>","list_archive_url":null,"date":"2017-09-27T19:56:32","name":"[v2,2/5] pci: Add interface names to hybrid PCI devices","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c771cdfe7601c81ae65a37da73f93ae1702d0eed","submitter":{"id":195,"url":"http://patchwork.ozlabs.org/api/people/195/?format=json","name":"Eduardo Habkost","email":"ehabkost@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170927195635.16014-3-ehabkost@redhat.com/mbox/","series":[{"id":5434,"url":"http://patchwork.ozlabs.org/api/series/5434/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5434","date":"2017-09-27T19:56:30","name":"Mark conventional/PCIe/hybrid PCI devices using interface names","version":2,"mbox":"http://patchwork.ozlabs.org/series/5434/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819288/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819288/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=ehabkost@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y2TC16hVMz9t30\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 28 Sep 2017 05:58:05 +1000 (AEST)","from localhost ([::1]:56150 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dxIT6-0006YN-2w\n\tfor incoming@patchwork.ozlabs.org; Wed, 27 Sep 2017 15:58:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47469)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <ehabkost@redhat.com>) id 1dxISJ-0006UJ-UP\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 15:57:20 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <ehabkost@redhat.com>) id 1dxISF-0007GJ-QU\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 15:57:16 -0400","from mx1.redhat.com ([209.132.183.28]:43624)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <ehabkost@redhat.com>) id 1dxISF-0007Fn-H6\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 15:57:11 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 82DB0108FAD;\n\tWed, 27 Sep 2017 19:57:10 +0000 (UTC)","from localhost (ovpn-116-18.gru2.redhat.com [10.97.116.18])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 15820675C5;\n\tWed, 27 Sep 2017 19:56:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 82DB0108FAD","From":"Eduardo Habkost <ehabkost@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Wed, 27 Sep 2017 16:56:32 -0300","Message-Id":"<20170927195635.16014-3-ehabkost@redhat.com>","In-Reply-To":"<20170927195635.16014-1-ehabkost@redhat.com>","References":"<20170927195635.16014-1-ehabkost@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 27 Sep 2017 19:57:10 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 2/5] pci: Add interface names to hybrid PCI\n\tdevices","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"\"Michael S. Tsirkin\" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, \n\tDmitry Fleytman <dmitry@daynix.com>,\n\tAlex Williamson <alex.williamson@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>,\n\tLaine Stump <laine@redhat.com>, Alistair Francis <alistair23@gmail.com>, \n\tMarcel Apfelbaum <marcel@redhat.com>, David Gibson <dgibson@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"The following devices support both PCI Express and Conventional\nPCI, by including special code to handle the QEMU_PCI_CAP_EXPRESS\nflag and/or conditional pcie_endpoint_cap_init() calls:\n\n* vfio-pci (is_express=1, but legacy PCI handled by\n  vfio_populate_device())\n* vmxnet3 (is_express=0, but PCIe handled by vmxnet3_realize())\n* pvscsi (is_express=0, but PCIe handled by pvscsi_realize())\n* virtio-pci (is_express=0, but PCIe handled by\n  virtio_pci_dc_realize(), and additional legacy PCI code at\n  virtio_pci_realize())\n* base-xhci (is_express=1, but pcie_endpoint_cap_init() call\n  is conditional on pci_bus_is_express(dev->bus)\n  * Note that xhci does not clear QEMU_PCI_CAP_EXPRESS like the\n    other hybrid devices\n\nCc: Dmitry Fleytman <dmitry@daynix.com>\nCc: Jason Wang <jasowang@redhat.com>\nCc: Paolo Bonzini <pbonzini@redhat.com>\nCc: Gerd Hoffmann <kraxel@redhat.com>\nCc: Alex Williamson <alex.williamson@redhat.com>\nCc: \"Michael S. Tsirkin\" <mst@redhat.com>\nSigned-off-by: Eduardo Habkost <ehabkost@redhat.com>\n---\nChanges v1 -> v2:\n* s/legacy/conventional/\n  * Suggested-by: Alex Williamson <alex.williamson@redhat.com>\n* Mark base-xhci as hybrid too\n---\n hw/net/vmxnet3.c       | 5 +++++\n hw/scsi/vmw_pvscsi.c   | 2 ++\n hw/usb/hcd-xhci.c      | 5 +++++\n hw/vfio/pci.c          | 5 +++++\n hw/virtio/virtio-pci.c | 5 +++++\n 5 files changed, 22 insertions(+)","diff":"diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c\nindex a19a7a31dd..f99d9a69ec 100644\n--- a/hw/net/vmxnet3.c\n+++ b/hw/net/vmxnet3.c\n@@ -2651,6 +2651,11 @@ static const TypeInfo vmxnet3_info = {\n     .instance_size = sizeof(VMXNET3State),\n     .class_init    = vmxnet3_class_init,\n     .instance_init = vmxnet3_instance_init,\n+    .interfaces = (InterfaceInfo[]) {\n+        { INTERFACE_PCIE_DEVICE },\n+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },\n+        { }\n+    },\n };\n \n static void vmxnet3_register_types(void)\ndiff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c\nindex 6d3f0bf11d..d6b315f8b2 100644\n--- a/hw/scsi/vmw_pvscsi.c\n+++ b/hw/scsi/vmw_pvscsi.c\n@@ -1300,6 +1300,8 @@ static const TypeInfo pvscsi_info = {\n     .class_init    = pvscsi_class_init,\n     .interfaces = (InterfaceInfo[]) {\n         { TYPE_HOTPLUG_HANDLER },\n+        { INTERFACE_PCIE_DEVICE },\n+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },\n         { }\n     }\n };\ndiff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c\nindex d75c085d94..af3a9d88de 100644\n--- a/hw/usb/hcd-xhci.c\n+++ b/hw/usb/hcd-xhci.c\n@@ -3670,6 +3670,11 @@ static const TypeInfo xhci_info = {\n     .instance_size = sizeof(XHCIState),\n     .class_init    = xhci_class_init,\n     .abstract      = true,\n+    .interfaces = (InterfaceInfo[]) {\n+        { INTERFACE_PCIE_DEVICE },\n+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },\n+        { }\n+    },\n };\n \n static void qemu_xhci_class_init(ObjectClass *klass, void *data)\ndiff --git a/hw/vfio/pci.c b/hw/vfio/pci.c\nindex 31e1edf447..913433d6ba 100644\n--- a/hw/vfio/pci.c\n+++ b/hw/vfio/pci.c\n@@ -3023,6 +3023,11 @@ static const TypeInfo vfio_pci_dev_info = {\n     .class_init = vfio_pci_dev_class_init,\n     .instance_init = vfio_instance_init,\n     .instance_finalize = vfio_instance_finalize,\n+    .interfaces = (InterfaceInfo[]) {\n+        { INTERFACE_PCIE_DEVICE },\n+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },\n+        { }\n+    },\n };\n \n static void register_vfio_pci_dev_type(void)\ndiff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c\nindex 8b0d6b69cd..67c8ab63ad 100644\n--- a/hw/virtio/virtio-pci.c\n+++ b/hw/virtio/virtio-pci.c\n@@ -1958,6 +1958,11 @@ static const TypeInfo virtio_pci_info = {\n     .class_init    = virtio_pci_class_init,\n     .class_size    = sizeof(VirtioPCIClass),\n     .abstract      = true,\n+    .interfaces = (InterfaceInfo[]) {\n+        { INTERFACE_PCIE_DEVICE },\n+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },\n+        { }\n+    },\n };\n \n /* virtio-blk-pci */\n","prefixes":["v2","2/5"]}