{"id":807332,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807332/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170829220539.31136.82540.stgit@gimli.home>","date":"2017-08-29T22:05:39","name":"[2/3] vfio/pci: Add virtual capabilities quirk infrastructure","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"41b43da6bc57bab25f67dc5e3bcb60177d8e0447","submitter":{"id":4123,"url":"http://patchwork.ozlabs.org/api/1.0/people/4123/?format=json","name":"Alex Williamson","email":"alex.williamson@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170829220539.31136.82540.stgit@gimli.home/mbox/","series":[{"id":492,"url":"http://patchwork.ozlabs.org/api/1.0/series/492/?format=json","date":"2017-08-29T22:05:24","name":"vfio/pci: Add NVIDIA GPUDirect P2P clique support","version":1,"mbox":"http://patchwork.ozlabs.org/series/492/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807332/checks/","tags":{},"headers":{"Return-Path":"","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=)","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=alex.williamson@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 3xhjS45lkmz9s9Y\n\tfor ;\n\tWed, 30 Aug 2017 08:07:48 +1000 (AEST)","from localhost ([::1]:47232 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmofi-0000D1-Jx\n\tfor incoming@patchwork.ozlabs.org; Tue, 29 Aug 2017 18:07:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39185)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmodo-00080O-HG\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 18:05:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmodj-0001bk-Ji\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 18:05:48 -0400","from mx1.redhat.com ([209.132.183.28]:43654)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmodj-0001Zj-Dy\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 18:05:43 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 6E45F883C6;\n\tTue, 29 Aug 2017 22:05:42 +0000 (UTC)","from gimli.home (ovpn-116-27.phx2.redhat.com [10.3.116.27])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 32AF36FEF1;\n\tTue, 29 Aug 2017 22:05:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6E45F883C6","From":"Alex Williamson ","To":"qemu-devel@nongnu.org","Date":"Tue, 29 Aug 2017 16:05:39 -0600","Message-ID":"<20170829220539.31136.82540.stgit@gimli.home>","In-Reply-To":"<20170829214929.31136.21144.stgit@gimli.home>","References":"<20170829214929.31136.21144.stgit@gimli.home>","User-Agent":"StGit/0.17.1-dirty","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tTue, 29 Aug 2017 22:05:42 +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 2/3] vfio/pci: Add virtual capabilities quirk\n\tinfrastructure","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"a175818323@gmail.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"If the hypervisor needs to add purely virtual capabilties, give us a\nhook through quirks to do that. Note that we determine the maximum\nsize for a capability based on the physical device, if we insert a\nvirtual capability, that can change. Therefore if maximum size is\nsmaller after added virt capabilities, use that.\n\nSigned-off-by: Alex Williamson \n---\n hw/vfio/pci-quirks.c | 4 ++++\n hw/vfio/pci.c | 8 ++++++++\n hw/vfio/pci.h | 1 +\n 3 files changed, 13 insertions(+)","diff":"diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c\nindex 349085ea12bc..40aaae76feb9 100644\n--- a/hw/vfio/pci-quirks.c\n+++ b/hw/vfio/pci-quirks.c\n@@ -1850,3 +1850,7 @@ void vfio_setup_resetfn_quirk(VFIOPCIDevice *vdev)\n break;\n }\n }\n+int vfio_add_virt_caps(VFIOPCIDevice *vdev, Error **errp)\n+{\n+ return 0;\n+}\ndiff --git a/hw/vfio/pci.c b/hw/vfio/pci.c\nindex 916d365dfab3..bfeaaef22d00 100644\n--- a/hw/vfio/pci.c\n+++ b/hw/vfio/pci.c\n@@ -1833,8 +1833,16 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp)\n pdev->config[PCI_CAPABILITY_LIST] = 0;\n vdev->emulated_config_bits[PCI_CAPABILITY_LIST] = 0xff;\n vdev->emulated_config_bits[PCI_STATUS] |= PCI_STATUS_CAP_LIST;\n+\n+ ret = vfio_add_virt_caps(vdev, errp);\n+ if (ret) {\n+ return ret;\n+ }\n }\n \n+ /* Scale down size, esp in case virt caps were added above */\n+ size = MIN(size, vfio_std_cap_max_size(pdev, pos));\n+\n /* Use emulated next pointer to allow dropping caps */\n pci_set_byte(vdev->emulated_config_bits + pos + PCI_CAP_LIST_NEXT, 0xff);\n \ndiff --git a/hw/vfio/pci.h b/hw/vfio/pci.h\nindex a8366bb2a74a..958cee058b3b 100644\n--- a/hw/vfio/pci.h\n+++ b/hw/vfio/pci.h\n@@ -160,6 +160,7 @@ void vfio_bar_quirk_setup(VFIOPCIDevice *vdev, int nr);\n void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr);\n void vfio_bar_quirk_finalize(VFIOPCIDevice *vdev, int nr);\n void vfio_setup_resetfn_quirk(VFIOPCIDevice *vdev);\n+int vfio_add_virt_caps(VFIOPCIDevice *vdev, Error **errp);\n \n int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp);\n \n","prefixes":["2/3"]}