From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQEam-0003qo-Fg for qemu-devel@nongnu.org; Mon, 22 Oct 2012 05:46:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQEaf-0004Wg-Rq for qemu-devel@nongnu.org; Mon, 22 Oct 2012 05:46:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQEaf-0004Wb-IG for qemu-devel@nongnu.org; Mon, 22 Oct 2012 05:46:33 -0400 Date: Mon, 22 Oct 2012 12:48:38 +0200 From: "Michael S. Tsirkin" Message-ID: <20121022104838.GC28828@redhat.com> References: <403b897354aed55caff4704662baacec5cd0b802.1350677361.git.jbaron@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <403b897354aed55caff4704662baacec5cd0b802.1350677361.git.jbaron@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 03/26] pci: pci capability must be in PCI space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Baron Cc: agraf@suse.de, aliguori@us.ibm.com, juzhang@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, armbru@redhat.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com On Fri, Oct 19, 2012 at 04:43:28PM -0400, Jason Baron wrote: > From: Isaku Yamahata > > pci capability must be in PCI space. > It can't lay in PCIe extended config space. > > Reviewed-by: Paolo Bonzini > Signed-off-by: Isaku Yamahata > Signed-off-by: Jason Baron Applied, thanks! > --- > hw/pci.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 2ca6ff6..b1b105d 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -1644,16 +1644,16 @@ PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) > return pci_create_simple_multifunction(bus, devfn, false, name); > } > > -static int pci_find_space(PCIDevice *pdev, uint8_t size) > +static uint8_t pci_find_space(PCIDevice *pdev, uint8_t size) > { > - int config_size = pci_config_size(pdev); > int offset = PCI_CONFIG_HEADER_SIZE; > int i; > - for (i = PCI_CONFIG_HEADER_SIZE; i < config_size; ++i) > + for (i = PCI_CONFIG_HEADER_SIZE; i < PCI_CONFIG_SPACE_SIZE; ++i) { > if (pdev->used[i]) > offset = i + 1; > else if (i - offset + 1 == size) > return offset; > + } > return 0; > } > > -- > 1.7.1