From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: Re: [PATCH QEMU-upstream] Fix build errors when enabling extra logging with #define DEBUG_XEN and #define XEN_PT_LOGGING_ENABLED Date: Wed, 9 Oct 2013 17:56:57 +0100 Message-ID: <20131009165657.GP28411@zion.uk.xensource.com> References: <1381336440-30745-1-git-send-email-linux@eikelenboom.it> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1381336440-30745-1-git-send-email-linux@eikelenboom.it> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Sander Eikelenboom Cc: Stefano Stabellini , wei.liu2@citrix.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Wed, Oct 09, 2013 at 06:34:00PM +0200, Sander Eikelenboom wrote: > > Signed-off-by: Sander Eikelenboom > --- > hw/xen/xen_pt.c | 2 +- > xen-all.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c > index ca2d460..3521e36 100644 > --- a/hw/xen/xen_pt.c > +++ b/hw/xen/xen_pt.c > @@ -570,7 +570,7 @@ 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)); Why is this needed? Isn't sec->size of type uint64? > } > > if (d->io_regions[bar].type & PCI_BASE_ADDRESS_SPACE_IO) { > diff --git a/xen-all.c b/xen-all.c > index 48e881b..5f45dce 100644 > --- a/xen-all.c > +++ b/xen-all.c > @@ -369,7 +369,7 @@ 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 ", > + DPRINTF("unmapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx", from " > "%"HWADDR_PRIx"\n", phys_offset, phys_offset + size, start_addr); This is indeeded messed up. A further problem is that the information it logs doesn't match the one in xen_add_to_physmap. I have a patch in queue that fixes this hunk... Wei. ----8<--- >>From 4e9ddf67d46163aec97e7a7b5ce19bce14fbd5f0 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 4 Oct 2013 20:10:14 +0100 Subject: [PATCH] xen-all.c: fix DPRINTF format string There is an extra comma at the end of first line. Also update logging style to be consistent with xen_add_to_physmap. Signed-off-by: Wei Liu --- xen-all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen-all.c b/xen-all.c index dd2521f..546a702 100644 --- a/xen-all.c +++ b/xen-all.c @@ -366,8 +366,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 > > size >>= TARGET_PAGE_BITS; > -- > 1.7.10.4 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel