From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Xu Subject: Re: [PATCH kvm-unit-tests v2 09/17] x86/vmexit: leverage pci_scan_bars() Date: Mon, 14 Nov 2016 15:35:54 -0500 Message-ID: <20161114203554.GE3125@pxdev.xzpeter.org> References: <1478704224-20472-1-git-send-email-peterx@redhat.com> <1478704224-20472-10-git-send-email-peterx@redhat.com> <20161110192758.eqazpjk3243pttb5@hawk.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: kvm@vger.kernel.org, rkrcmar@redhat.com, agordeev@redhat.com, jan.kiszka@web.de, pbonzini@redhat.com To: Andrew Jones Return-path: Received: from mx1.redhat.com ([209.132.183.28]:55966 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933478AbcKNUf5 (ORCPT ); Mon, 14 Nov 2016 15:35:57 -0500 Content-Disposition: inline In-Reply-To: <20161110192758.eqazpjk3243pttb5@hawk.localdomain> Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Nov 10, 2016 at 08:27:58PM +0100, Andrew Jones wrote: [...] > > @@ -389,17 +389,12 @@ int main(int ac, char **av) > > ret = pci_find_dev(PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_TEST); > > if (ret != PCIDEVADDR_INVALID) { > > pci_dev_init(&pcidev, ret); > > - for (i = 0; i < PCI_TESTDEV_NUM_BARS; i++) { > > - if (!pci_bar_is_valid(&pcidev, i)) { > > - continue; > > - } > > - if (pci_bar_is_memory(&pcidev, i)) { > > - membar = pci_bar_get_addr(&pcidev, i); > > - pci_test.memaddr = ioremap(membar, PAGE_SIZE); > > - } else { > > - pci_test.iobar = pci_bar_get_addr(&pcidev, i); > > - } > > - } > > + pci_scan_bars(&pcidev); > > + assert(pci_bar_is_memory(&pcidev, PCI_TESTDEV_BAR_MEM)); > > + assert(!pci_bar_is_memory(&pcidev, PCI_TESTDEV_BAR_IO)); > > + membar = pcidev.bar[PCI_TESTDEV_BAR_MEM]; > > nit: I'd drop 'membar' and just pass pcidev.bar to ioremap Below printf() is using it as well. I kept it in case anyone is using the below printf for any reason. > > > + pci_test.memaddr = ioremap(membar, PAGE_SIZE); > > + pci_test.iobar = pcidev.bar[PCI_TESTDEV_BAR_IO]; > > printf("pci-testdev at 0x%x membar %lx iobar %x\n", > > pcidev.bdf, membar, pci_test.iobar); > > } > > -- > > 2.7.4 > > Thanks, -- peterx