From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuP0z-0007hu-Hx for qemu-devel@nongnu.org; Sun, 04 Oct 2009 07:12:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuP0s-0007gR-71 for qemu-devel@nongnu.org; Sun, 04 Oct 2009 07:12:32 -0400 Received: from [199.232.76.173] (port=52455 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuP0q-0007g6-VD for qemu-devel@nongnu.org; Sun, 04 Oct 2009 07:12:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9994) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MuP0q-0004XQ-HG for qemu-devel@nongnu.org; Sun, 04 Oct 2009 07:12:24 -0400 Date: Sun, 4 Oct 2009 13:10:21 +0200 From: "Michael S. Tsirkin" Message-ID: <20091004111021.GR16887@redhat.com> References: <1254514577-11896-1-git-send-email-yamahata@valinux.co.jp> <1254514577-11896-26-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1254514577-11896-26-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 25/25] pci/monitor: print out bridge's filtering values and so on. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Sat, Oct 03, 2009 at 05:16:17AM +0900, Isaku Yamahata wrote: > make pci_info_device() print out bridge's filtering value like > io base/limit, subbus and subordinate bus. > > Signed-off-by: Isaku Yamahata > --- > hw/pci.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 43 insertions(+), 0 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 40d7090..76953fe 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -1064,7 +1064,50 @@ static void pci_info_device(PCIBus *bus, PCIDevice *d) > d->config[PCI_INTERRUPT_LINE]); > } > if (class == 0x0604) { > + int shift; > + uint64_t base; > + uint64_t limit; just use unsigned long long and you won't need PRIx64: just %llx. > monitor_printf(mon, " BUS %d.\n", d->config[0x19]); > + monitor_printf(mon, " SECONDARY BUS %d.\n", > + d->config[PCI_SECONDARY_BUS]); > + monitor_printf(mon, " SUBORDINATE BUS %d.\n", > + d->config[PCI_SUBORDINATE_BUS]); > + Haven't yes looked at surrounding code: is it all shouting in upper case like this? > + if (d->config[PCI_IO_BASE] & PCI_IO_RANGE_TYPE_32) { > + shift = 16; > + } else { > + shift = 8; > + } > + base = ((uint32_t)d->config[PCI_IO_BASE] & ~PCI_IO_RANGE_TYPE_MASK) > + << shift; > + base |= pci_get_word(d->config + PCI_IO_BASE_UPPER16) << 16; > + limit = ((uint32_t)d->config[PCI_IO_LIMIT] & ~PCI_IO_RANGE_TYPE_MASK) > + << shift; > + limit |= pci_get_word(d->config + PCI_IO_LIMIT_UPPER16) << 16; Can this just use the pci_get_quad functions? > + limit |= 0xfff; what's this? > + monitor_printf(mon, " IO range [0x%04"PRIx64", 0x%04"PRIx64"]\n", > + base, limit); > + > + shift = 16; > + base = (pci_get_word(d->config + PCI_MEMORY_BASE) & > + PCI_MEMORY_RANGE_MASK) << shift; > + limit = (pci_get_word(d->config + PCI_MEMORY_LIMIT) & > + PCI_MEMORY_RANGE_MASK) << shift; > + limit |= 0xfffff; > + monitor_printf(mon, > + " MEM range [0x%08"PRIx64", 0x%08"PRIx64"]\n", > + base, limit); > + shift = 16; > + base = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_BASE) & > + PCI_PREF_RANGE_MASK) << shift; > + limit = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_LIMIT) & > + PCI_PREF_RANGE_MASK) << shift; > + base |= (uint64_t)pci_get_long(d->config + PCI_PREF_BASE_UPPER32) << 32; > + limit |= (uint64_t)pci_get_long(d->config + PCI_PREF_LIMIT_UPPER32) << 32; > + limit |= 0xfffff; > + monitor_printf(mon, > + " pref MEM range [0x%08"PRIx64", 0x%08"PRIx64"]\n", Why mix case? User likely won't know what's pref MEM. Let's use plain English? > + base, limit); > } > for(i = 0;i < PCI_NUM_REGIONS; i++) { > r = &d->io_regions[i]; > -- > 1.6.0.2 > >