From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuoVt-0004Yc-Bl for qemu-devel@nongnu.org; Mon, 05 Oct 2009 10:26:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuoVo-0004YA-QH for qemu-devel@nongnu.org; Mon, 05 Oct 2009 10:26:08 -0400 Received: from [199.232.76.173] (port=48673 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuoVo-0004Y7-L8 for qemu-devel@nongnu.org; Mon, 05 Oct 2009 10:26:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15405) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MuoVo-0005iV-9D for qemu-devel@nongnu.org; Mon, 05 Oct 2009 10:26:04 -0400 Date: Mon, 5 Oct 2009 16:24:02 +0200 From: "Michael S. Tsirkin" Message-ID: <20091005142402.GE31056@redhat.com> References: <1254737223-16129-1-git-send-email-yamahata@valinux.co.jp> <1254737223-16129-24-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1254737223-16129-24-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 23/23] 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 Mon, Oct 05, 2009 at 07:07:03PM +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 | 39 +++++++++++++++++++++++++++++++++++++++ > 1 files changed, 39 insertions(+), 0 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 2694e83..570531c 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -1032,7 +1032,46 @@ static void pci_info_device(PCIBus *bus, PCIDevice *d) > d->config[PCI_INTERRUPT_LINE]); > } > if (class == 0x0604) { > + uint64_t base; > + uint64_t limit; > + > 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]); > + > + base = > + ((uint32_t)d->config[PCI_IO_BASE] & ~PCI_IO_RANGE_TYPE_MASK) << 8; > + limit = > + ((uint32_t)d->config[PCI_IO_LIMIT] & ~PCI_IO_RANGE_TYPE_MASK) << 8; > + if (d->config[PCI_IO_BASE] & PCI_IO_RANGE_TYPE_32) { > + base |= pci_get_word(d->config + PCI_IO_BASE_UPPER16) << 16; pci_get_word returns a 16 bit integer. Isn't shifting it by 16 bit wrong? > + limit |= pci_get_word(d->config + PCI_IO_LIMIT_UPPER16) << 16; > + } > + limit |= 0xfff; > + monitor_printf(mon, " IO range [0x%04"PRIx64", 0x%04"PRIx64"]\n", > + base, limit); > + > + base = (pci_get_word(d->config + PCI_MEMORY_BASE) & > + PCI_MEMORY_RANGE_MASK) << 16; > + limit = (pci_get_word(d->config + PCI_MEMORY_LIMIT) & > + PCI_MEMORY_RANGE_MASK) << 16; > + limit |= 0xfffff; > + monitor_printf(mon, > + " memory range [0x%08"PRIx64", 0x%08"PRIx64"]\n", > + base, limit); > + base = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_BASE) & > + PCI_PREF_RANGE_MASK) << 16; > + limit = ((uint64_t)pci_get_word(d->config + PCI_PREF_MEMORY_LIMIT) & > + PCI_PREF_RANGE_MASK) << 16; > + 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, " prefetchable memory range " > + "[0x%08"PRIx64", 0x%08"PRIx64"]\n", base, limit); Here, for once, is a chance to add a helper routine to good effect :) > } > for(i = 0;i < PCI_NUM_REGIONS; i++) { > r = &d->io_regions[i]; > -- > 1.6.0.2