From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnBqZ-0000xc-7n for qemu-devel@nongnu.org; Sun, 01 Dec 2013 13:34:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnBqU-0001S1-54 for qemu-devel@nongnu.org; Sun, 01 Dec 2013 13:34:23 -0500 Received: from smtp.citrix.com ([66.165.176.89]:14245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnBqU-0001Rj-0J for qemu-devel@nongnu.org; Sun, 01 Dec 2013 13:34:18 -0500 From: Stefano Stabellini Date: Sun, 1 Dec 2013 18:33:52 +0000 Message-ID: <1385922833-18524-1-git-send-email-stefano.stabellini@eu.citrix.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PULL 1/2] xen: fix two errors when debug is enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: xen-devel@lists.xensource.com, Wei Liu , Stefano Stabellini , qemu-devel@nongnu.org, Sander Eikelenboom , Anthony.Perard@citrix.com From: Wei Liu This patch fixes: 1. build error in xen_pt.c when XEN_PT_LOGGING_ENABLED is defined 2. debug output format string error when DEBUG_XEN is defined In the second case I also have the output info in consistent with the output in mapping function - that is, print start_addr instead of phys_offset. Signed-off-by: Sander Eikelenboom Signed-off-by: Wei Liu Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 3 ++- xen-all.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index ca2d460..d58cb61 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -570,7 +570,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s, if (args.rc) { XEN_PT_WARN(d, "Region: %d (addr: %#"FMT_PCIBUS ", len: %#"FMT_PCIBUS") is overlapped.\n", - bar, sec->offset_within_address_space, sec->size); + bar, sec->offset_within_address_space, + int128_get64(sec->size)); } if (d->io_regions[bar].type & PCI_BASE_ADDRESS_SPACE_IO) { diff --git a/xen-all.c b/xen-all.c index 9a27899..4a594bd 100644 --- a/xen-all.c +++ b/xen-all.c @@ -369,8 +369,8 @@ static int xen_remove_from_physmap(XenIOState *state, phys_offset = physmap->phys_offset; size = physmap->size; - DPRINTF("unmapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx", from ", - "%"HWADDR_PRIx"\n", phys_offset, phys_offset + size, start_addr); + DPRINTF("unmapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx", at " + "%"HWADDR_PRIx"\n", start_addr, start_addr + size, phys_offset); size >>= TARGET_PAGE_BITS; start_addr >>= TARGET_PAGE_BITS; -- 1.7.10.4