Wei Liu
2013-Oct-14 12:53 UTC
[PATCH QEMU-upstream] 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: Sander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Anthony Perard <anthony.perard@citrix.com>
---
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
Stefano Stabellini
2013-Oct-15 10:57 UTC
Re: [PATCH QEMU-upstream] xen: fix two errors when debug is enabled
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@eikelenboom.it> > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > Cc: Anthony Perard <anthony.perard@citrix.com>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 >
Wei Liu
2013-Nov-01 16:01 UTC
Re: [PATCH QEMU-upstream] xen: fix two errors when debug is enabled
On Tue, Oct 15, 2013 at 11:57:01AM +0100, Stefano Stabellini wrote:> 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@eikelenboom.it> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > Cc: Anthony Perard <anthony.perard@citrix.com> > > Looks good. >I take it as an Acked-by. I seem to have forgotten CC qemu-devel. Should I resend it to qemu-devel? Or are you going to send it via git pull? Wei.> > > 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 > >
Stefano Stabellini
2013-Nov-06 17:20 UTC
Re: [PATCH QEMU-upstream] xen: fix two errors when debug is enabled
On Fri, 1 Nov 2013, Wei Liu wrote:> On Tue, Oct 15, 2013 at 11:57:01AM +0100, Stefano Stabellini wrote: > > 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@eikelenboom.it> > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > > Cc: Anthony Perard <anthony.perard@citrix.com> > > > > Looks good. > > > > I take it as an Acked-by. > > I seem to have forgotten CC qemu-devel. Should I resend it to > qemu-devel?No, that''s OK for this time.> Or are you going to send it via git pull?Yes> > > > > > 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 > > > >
Fabio Fantoni
2013-Nov-25 09:56 UTC
Re: [PATCH QEMU-upstream] xen: fix two errors when debug is enabled
Il 06/11/2013 18:20, Stefano Stabellini ha scritto:> On Fri, 1 Nov 2013, Wei Liu wrote: >> On Tue, Oct 15, 2013 at 11:57:01AM +0100, Stefano Stabellini wrote: >>> 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@eikelenboom.it> >>>> Signed-off-by: Wei Liu <wei.liu2@citrix.com> >>>> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> >>>> Cc: Anthony Perard <anthony.perard@citrix.com>Tested-by: Fabio Fantoni <fabio.fantoni@m2r.biz>>>> Looks good. >>> >> I take it as an Acked-by. >> >> I seem to have forgotten CC qemu-devel. Should I resend it to >> qemu-devel? > No, that''s OK for this time. > > >> Or are you going to send it via git pull? > YesSeems not posted to qemu-devel and even on http://xenbits.xen.org/gitweb/?p=staging/qemu-upstream-unstable.git;a=summary for now. I did fast test of patch without finding problems, then it just seems forgotten.> > >>>> 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@lists.xen.org > http://lists.xen.org/xen-devel