Commit d18e173a authored by Wei Liu's avatar Wei Liu Committed by Stefano Stabellini
Browse files

xen: fix two errors when debug is enabled 



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: default avatarSander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent 7dc65c02

hw/xen/xen_pt.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {

xen-all.c

+2 −2
Original line number Diff line number Diff line
@@ -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;