From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoqZ0-0002ln-KC for qemu-devel@nongnu.org; Mon, 26 May 2014 04:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WoqYs-0002az-58 for qemu-devel@nongnu.org; Mon, 26 May 2014 04:47:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoqYr-0002ae-TN for qemu-devel@nongnu.org; Mon, 26 May 2014 04:47:14 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4Q8lD5P007837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 May 2014 04:47:13 -0400 From: Gerd Hoffmann Date: Mon, 26 May 2014 10:46:59 +0200 Message-Id: <1401094027-5275-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1401094027-5275-1-git-send-email-kraxel@redhat.com> References: <1401094027-5275-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 02/10] xhci: add endpoint cap on express bus only List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-xhci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 6753a42..a203bc6 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3594,8 +3594,10 @@ static int usb_xhci_initfn(struct PCIDevice *dev) PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64, &xhci->mem); - ret = pcie_endpoint_cap_init(dev, 0xa0); - assert(ret >= 0); + if (pci_bus_is_express(dev->bus)) { + ret = pcie_endpoint_cap_init(dev, 0xa0); + assert(ret >= 0); + } if (xhci->flags & (1 << XHCI_FLAG_USE_MSI)) { msi_init(dev, 0x70, xhci->numintrs, true, false); -- 1.8.3.1