{"id":811631,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811631/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-16-git-send-email-mst@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504880304-12069-16-git-send-email-mst@redhat.com>","list_archive_url":null,"date":"2017-09-08T14:19:36","name":"[PULL,15/17] pci: move check for existing devfn into new pci_bus_devfn_available() helper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"efab3b9997ff755cfdf573bfef79bba991a1ca50","submitter":{"id":2235,"url":"http://patchwork.ozlabs.org/api/1.2/people/2235/?format=json","name":"Michael S. Tsirkin","email":"mst@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-16-git-send-email-mst@redhat.com/mbox/","series":[{"id":2227,"url":"http://patchwork.ozlabs.org/api/1.2/series/2227/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2227","date":"2017-09-08T14:18:52","name":"[PULL,01/17] vhost: Release memory references on cleanup","version":1,"mbox":"http://patchwork.ozlabs.org/series/2227/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811631/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811631/checks/","tags":{},"related":[],"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=mst@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 3xpfkC2Sztz9s7G\n\tfor ;\n\tSat, 9 Sep 2017 00:25:39 +1000 (AEST)","from localhost ([::1]:45694 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqKDx-0003VV-BR\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 10:25:37 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49263)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqK8H-0006zF-C0\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqK8D-0005J9-Bx\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:45 -0400","from mx1.redhat.com ([209.132.183.28]:59652)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dqK8D-0005IJ-4d\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:41 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 301FF883CE;\n\tFri, 8 Sep 2017 14:19:40 +0000 (UTC)","from redhat.com (ovpn-120-144.rdu2.redhat.com [10.10.120.144])\n\tby smtp.corp.redhat.com (Postfix) with SMTP id 1B365627DF;\n\tFri, 8 Sep 2017 14:19:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 301FF883CE","Date":"Fri, 8 Sep 2017 17:19:36 +0300","From":"\"Michael S. Tsirkin\" ","To":"qemu-devel@nongnu.org","Message-ID":"<1504880304-12069-16-git-send-email-mst@redhat.com>","References":"<1504880304-12069-1-git-send-email-mst@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1504880304-12069-1-git-send-email-mst@redhat.com>","X-Mutt-Fcc":"=sent","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tFri, 08 Sep 2017 14:19:40 +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] [PULL 15/17] pci: move check for existing devfn into\n\tnew pci_bus_devfn_available() helper","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":"Marcel Apfelbaum ,\n\tPeter Maydell ,\n\tMark Cave-Ayland ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Mark Cave-Ayland \n\nAlso touch up the logic in do_pci_register_device() accordingly.\n\nSigned-off-by: Mark Cave-Ayland \nReviewed-by: Marcel Apfelbaum \nReviewed-by: Michael S. Tsirkin \nSigned-off-by: Michael S. Tsirkin \n---\n hw/pci/pci.c | 10 ++++++++--\n 1 file changed, 8 insertions(+), 2 deletions(-)","diff":"diff --git a/hw/pci/pci.c b/hw/pci/pci.c\nindex 26f346d..002e669 100644\n--- a/hw/pci/pci.c\n+++ b/hw/pci/pci.c\n@@ -953,6 +953,11 @@ uint16_t pci_requester_id(PCIDevice *dev)\n return pci_req_id_cache_extract(&dev->requester_id_cache);\n }\n \n+static bool pci_bus_devfn_available(PCIBus *bus, int devfn)\n+{\n+ return !(bus->devices[devfn]);\n+}\n+\n /* -1 for devfn means auto assign */\n static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,\n const char *name, int devfn,\n@@ -976,14 +981,15 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,\n if (devfn < 0) {\n for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices);\n devfn += PCI_FUNC_MAX) {\n- if (!bus->devices[devfn])\n+ if (pci_bus_devfn_available(bus, devfn)) {\n goto found;\n+ }\n }\n error_setg(errp, \"PCI: no slot/function available for %s, all in use\",\n name);\n return NULL;\n found: ;\n- } else if (bus->devices[devfn]) {\n+ } else if (!pci_bus_devfn_available(bus, devfn)) {\n error_setg(errp, \"PCI: slot %d function %d not available for %s,\"\n \" in use by %s\",\n PCI_SLOT(devfn), PCI_FUNC(devfn), name,\n","prefixes":["PULL","15/17"]}