{"id":807331,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807331/?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":"<20170829220532.31136.42932.stgit@gimli.home>","date":"2017-08-29T22:05:32","name":"[1/3] vfio/pci: Do not unwind on error","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8a991cada11842063420ccd123575bd425824ab2","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/20170829220532.31136.42932.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/807331/checks/","tags":{},"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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xhjQV4R2Dz9s9Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 08:06:26 +1000 (AEST)","from localhost ([::1]:47230 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 1dmoeO-0007sQ-CJ\n\tfor incoming@patchwork.ozlabs.org; Tue, 29 Aug 2017 18:06:24 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39134)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <alex.williamson@redhat.com>) id 1dmodc-0007r1-TG\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 18:05:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <alex.williamson@redhat.com>) id 1dmodb-0001Tp-Tz\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 18:05:36 -0400","from mx1.redhat.com ([209.132.183.28]:37294)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <alex.williamson@redhat.com>)\n\tid 1dmodb-0001TG-NL\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 18:05:35 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 B3BF9C04BD2C;\n\tTue, 29 Aug 2017 22:05:34 +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 7B8905D9C8;\n\tTue, 29 Aug 2017 22:05:32 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B3BF9C04BD2C","From":"Alex Williamson <alex.williamson@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Tue, 29 Aug 2017 16:05:32 -0600","Message-ID":"<20170829220532.31136.42932.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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tTue, 29 Aug 2017 22:05:34 +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 1/3] vfio/pci: Do not unwind on error","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":"a175818323@gmail.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":"If vfio_add_std_cap() errors then going to out prepends irrelevant\nerrors for capabilities we haven't attempted to add as we unwind our\nrecursive stack.  Just return error.\n\nFixes: 7ef165b9a8d9 (\"vfio/pci: Pass an error object to vfio_add_capabilities\")\nSigned-off-by: Alex Williamson <alex.williamson@redhat.com>\n---\n hw/vfio/pci.c |    4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c\nindex 31e1edf44745..916d365dfab3 100644\n--- a/hw/vfio/pci.c\n+++ b/hw/vfio/pci.c\n@@ -1826,7 +1826,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp)\n     if (next) {\n         ret = vfio_add_std_cap(vdev, next, errp);\n         if (ret) {\n-            goto out;\n+            return ret;\n         }\n     } else {\n         /* Begin the rebuild, use QEMU emulated list bits */\n@@ -1862,7 +1862,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp)\n         ret = pci_add_capability(pdev, cap_id, pos, size, errp);\n         break;\n     }\n-out:\n+\n     if (ret < 0) {\n         error_prepend(errp,\n                       \"failed to add PCI capability 0x%x[0x%x]@0x%x: \",\n","prefixes":["1/3"]}