Re: [Xen-devel] [PATCH QEMU-upstream] xen: fix two errors when debug is enabled

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Mon, 14 Oct 2013, Wei Liu wrote:
> 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 <linux@xxxxxxxxxxxxxx>
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Anthony Perard <anthony.perard@xxxxxxxxxx>

Looks good.


>  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
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel