From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCuVG-0006Ee-03 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 16:00:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCuVA-0001YR-HC for qemu-devel@nongnu.org; Tue, 14 Jun 2016 16:00:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCuVA-0001YN-Ba for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:56 -0400 Date: Tue, 14 Jun 2016 22:59:54 +0300 From: "Michael S. Tsirkin" Message-ID: <20160614225954-mutt-send-email-mst@redhat.com> References: <1465934227-16558-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1465934227-16558-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 16/32] pci core: assert ENOSPC when add capability List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Cao jin , Marcel Apfelbaum , Markus Armbruster From: Cao jin ENOSPC is programming error, assert it for debugging. cc: Michael S. Tsirkin cc: Marcel Apfelbaum cc: Markus Armbruster Reviewed-by: Markus Armbruster Reviewed-by: Marcel Apfelbaum Signed-off-by: Cao jin Reviewed-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 87bea47..4b585f4 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2228,10 +2228,8 @@ int pci_add_capability2(PCIDevice *pdev, uint8_t cap_id, if (!offset) { offset = pci_find_space(pdev, size); - if (!offset) { - error_setg(errp, "out of PCI config space"); - return -ENOSPC; - } + /* out of PCI config space is programming error */ + assert(offset); } else { /* Verify that capabilities don't overlap. Note: device assignment * depends on this check to verify that the device is not broken. -- MST