From patchwork Mon Oct 5 10:06:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CEB0FB7BC3 for ; Mon, 5 Oct 2009 21:31:41 +1100 (EST) Received: from localhost ([127.0.0.1]:49451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mukqw-0003bt-KR for incoming@patchwork.ozlabs.org; Mon, 05 Oct 2009 06:31:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MukV8-0001EL-RB for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:09:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MukUv-00013p-LG for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:08:57 -0400 Received: from [199.232.76.173] (port=44774 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MukUu-00013K-Tn for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:08:53 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:55415) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MukUt-00076j-BX for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:08:52 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id DFDB549D87; Mon, 5 Oct 2009 19:08:41 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MukT9-0004Cw-T4; Mon, 05 Oct 2009 19:07:03 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Mon, 5 Oct 2009 19:06:50 +0900 Message-Id: <1254737223-16129-11-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254737223-16129-1-git-send-email-yamahata@valinux.co.jp> References: <1254737223-16129-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 10/23] pci: introduce FMT_PCIBUS for printf format for pcibus_t. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch is preliminary for 64bit BAR. Later pcibus_t will be changed from uint32_t to uint64_t. Introduce FMT_PCIBUS for printf format for pcibus_t. Signed-off-by: Isaku Yamahata --- hw/e1000.c | 6 ++++-- hw/eepro100.c | 6 ++++-- hw/pci.c | 11 ++++++----- hw/pci.h | 1 + hw/pcnet.c | 5 +++-- hw/wdt_i6300esb.c | 3 ++- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index c07eb42..8721e0e 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -145,7 +145,8 @@ static void ioport_map(PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type) { - DBGOUT(IO, "e1000_ioport_map addr=0x%04x size=0x%08x\n", addr, size); + DBGOUT(IO, "e1000_ioport_map addr=0x%04"FMT_PCIBUS" size=0x%08"FMT_PCIBUS"\n", + addr, size); } static void @@ -1040,7 +1041,8 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num, }; - DBGOUT(MMIO, "e1000_mmio_map addr=0x%08x 0x%08x\n", addr, size); + DBGOUT(MMIO, "e1000_mmio_map addr=0x%08"FMT_PCIBUS" 0x%08"FMT_PCIBUS"\n", + addr, size); cpu_register_physical_memory(addr, PNPMMIO_SIZE, d->mmio_index); qemu_register_coalesced_mmio(addr, excluded_regs[0]); diff --git a/hw/eepro100.c b/hw/eepro100.c index 1a1a0da..52bfb1f 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1378,7 +1378,8 @@ static void pci_map(PCIDevice * pci_dev, int region_num, { EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); - TRACE(OTHER, logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", + TRACE(OTHER, logout("region %d, addr=0x%08"FMT_PCIBUS", " + "size=0x%08"FMT_PCIBUS", type=%d\n", region_num, addr, size, type)); assert(region_num == 1); @@ -1457,7 +1458,8 @@ static void pci_mmio_map(PCIDevice * pci_dev, int region_num, { EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); - TRACE(OTHER, logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", + TRACE(OTHER, logout("region %d, addr=0x%08"FMT_PCIBUS", " + "size=0x%08"FMT_PCIBUS", type=%d\n", region_num, addr, size, type)); if (region_num == 0) { diff --git a/hw/pci.c b/hw/pci.c index 674daba..8d6e8ea 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -408,7 +408,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, if (size & (size-1)) { fprintf(stderr, "ERROR: PCI region size must be pow2 " - "type=0x%x, size=0x%x\n", type, size); + "type=0x%x, size=0x%"FMT_PCIBUS"\n", type, size); exit(1); } @@ -427,7 +427,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, addr = 0x10 + region_num * 4; } pci_set_long(pci_dev->config + addr, type); - pci_set_long(pci_dev->wmask + addr, wmask); + pci_set_long(pci_dev->wmask + addr, wmask & 0xffffffff); pci_set_long(pci_dev->cmask + addr, 0xffffffff); } @@ -729,10 +729,10 @@ static void pci_info_device(PCIDevice *d) if (r->size != 0) { monitor_printf(mon, " BAR%d: ", i); if (r->type & PCI_ADDRESS_SPACE_IO) { - monitor_printf(mon, "I/O at 0x%04x [0x%04x].\n", + monitor_printf(mon, "I/O at 0x%04"FMT_PCIBUS" [0x%04"FMT_PCIBUS"].\n", r->addr, r->addr + r->size - 1); } else { - monitor_printf(mon, "32 bit memory at 0x%08x [0x%08x].\n", + monitor_printf(mon, "32 bit memory at 0x%08"FMT_PCIBUS" [0x%08"FMT_PCIBUS"].\n", r->addr, r->addr + r->size - 1); } } @@ -1047,7 +1047,8 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) r = &d->io_regions[i]; if (!r->size) continue; - monitor_printf(mon, "%*sbar %d: %s at 0x%x [0x%x]\n", indent, "", + monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_PCIBUS" [0x%"FMT_PCIBUS"]\n", + indent, "", i, r->type & PCI_ADDRESS_SPACE_IO ? "i/o" : "mem", r->addr, r->addr + r->size - 1); } diff --git a/hw/pci.h b/hw/pci.h index 2796c1d..359fce1 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -72,6 +72,7 @@ extern target_phys_addr_t pci_mem_base; #define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003 typedef uint32_t pcibus_t; +#define FMT_PCIBUS PRIx32 typedef void PCIConfigWriteFunc(PCIDevice *pci_dev, uint32_t address, uint32_t data, int len); diff --git a/hw/pcnet.c b/hw/pcnet.c index 2789574..b4d85a5 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1766,7 +1766,8 @@ static void pcnet_ioport_map(PCIDevice *pci_dev, int region_num, PCNetState *d = &DO_UPCAST(PCIPCNetState, pci_dev, pci_dev)->state; #ifdef PCNET_DEBUG_IO - printf("pcnet_ioport_map addr=0x%04x size=0x%04x\n", addr, size); + printf("pcnet_ioport_map addr=0x%04"FMT_PCIBUS" size=0x%04"FMT_PCIBUS"\n", + addr, size); #endif register_ioport_write(addr, 16, 1, pcnet_aprom_writeb, d); @@ -1994,7 +1995,7 @@ static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num, PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); #ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_map addr=0x%08x 0x%08x\n", addr, size); + printf("pcnet_mmio_map addr=0x%08"FMT_PCIBUS" 0x%08"FMT_PCIBUS"\n", addr, size); #endif cpu_register_physical_memory(addr, PCNET_PNPMMIO_SIZE, d->state.mmio_index); diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c index d3ab3c8..88450a8 100644 --- a/hw/wdt_i6300esb.c +++ b/hw/wdt_i6300esb.c @@ -362,7 +362,8 @@ static void i6300esb_map(PCIDevice *dev, int region_num, I6300State *d = DO_UPCAST(I6300State, dev, dev); int io_mem; - i6300esb_debug("addr = %x, size = %x, type = %d\n", addr, size, type); + i6300esb_debug("addr = %"FMT_PCIBUS", size = %"FMT_PCIBUS", type = %d\n", + addr, size, type); io_mem = cpu_register_io_memory(mem_read, mem_write, d); cpu_register_physical_memory (addr, 0x10, io_mem);