From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUsva-0005e9-2m for qemu-devel@nongnu.org; Thu, 27 Aug 2015 04:52:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUsvY-0001dp-GU for qemu-devel@nongnu.org; Thu, 27 Aug 2015 04:52:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUsvY-0001dk-B5 for qemu-devel@nongnu.org; Thu, 27 Aug 2015 04:52:56 -0400 Date: Thu, 27 Aug 2015 11:52:53 +0300 From: "Michael S. Tsirkin" Message-ID: <1440665434-2893-2-git-send-email-mst@redhat.com> References: <1440665434-2893-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1440665434-2893-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] pci-test: allow bar > 4k List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, qemu-devel@nongnu.org vmexit using test assumes BAR size is exactly 4K. Remove this restriction, allow any BAR size. Signed-off-by: Michael S. Tsirkin --- x86/vmexit.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/x86/vmexit.c b/x86/vmexit.c index 7e9af15..3ff7fbf 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -407,7 +407,7 @@ bool test_wanted(struct test *test, char *wanted[], int nwanted) int main(int ac, char **av) { int i; - unsigned long membar = 0, base, offset; + unsigned long membar = 0, base, offset, size; void *m; pcidevaddr_t pcidev; @@ -425,12 +425,18 @@ int main(int ac, char **av) continue; } if (pci_bar_is_memory(pcidev, i)) { + int p; + + size = pci_bar_size(pcidev, i); membar = pci_bar_addr(pcidev, i); - base = membar & ~4095; + base = membar & ~(size - 1); offset = membar - base; - m = alloc_vpages(1); - - install_page((void *)read_cr3(), base, m); + m = alloc_vpages(size / 4096); + + for (p = 0; p < size; p += 4096) { + install_page((void *)read_cr3(), base + p, + m + p); + } pci_test.memaddr = m + offset; } else { pci_test.iobar = pci_bar_addr(pcidev, i); -- MST