Patchwork [5/5] trace-events: Fix broken build caused by wrong format specifier

login
register
mail settings
Submitter Stefan Hajnoczi
Date March 26, 2012, 12:07 p.m.
Message ID <1332763670-32063-6-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/148719/
State New
Headers show

Comments

Stefan Hajnoczi - March 26, 2012, 12:07 p.m.
From: Stefan Weil <sw@weilnetz.de>

mem is an uint64_t value, so %lx was wrong.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 trace-events |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andreas Färber - March 26, 2012, 12:41 p.m.
Am 26.03.2012 14:07, schrieb Stefan Hajnoczi:
> From: Stefan Weil <sw@weilnetz.de>
> 
> mem is an uint64_t value, so %lx was wrong.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Alon, you replied with an "ACK". Should an Acked-by be inserted here?

Andreas

> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
>  trace-events |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/trace-events b/trace-events
> index 70f059d..db2cd39 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -726,7 +726,7 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p"
>  # hw/qxl.c
>  disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
>  disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"
> -qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"
> +qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"
>  qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"
>  qxl_destroy_primary(int qid) "%d"
>  qxl_enter_vga_mode(int qid) "%d"
Alon Levy - March 26, 2012, 12:48 p.m.
On Mon, Mar 26, 2012 at 02:41:23PM +0200, Andreas Färber wrote:
> Am 26.03.2012 14:07, schrieb Stefan Hajnoczi:
> > From: Stefan Weil <sw@weilnetz.de>
> > 
> > mem is an uint64_t value, so %lx was wrong.
> > 
> > Signed-off-by: Stefan Weil <sw@weilnetz.de>
> 
> Alon, you replied with an "ACK". Should an Acked-by be inserted here?

Yes, should have been verbose, sorry. But I don't think it matters much
for this kind of small patch.

> 
> Andreas
> 
> > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> > ---
> >  trace-events |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/trace-events b/trace-events
> > index 70f059d..db2cd39 100644
> > --- a/trace-events
> > +++ b/trace-events
> > @@ -726,7 +726,7 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p"
> >  # hw/qxl.c
> >  disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
> >  disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"
> > -qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"
> > +qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"
> >  qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"
> >  qxl_destroy_primary(int qid) "%d"
> >  qxl_enter_vga_mode(int qid) "%d"
> 
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Patch

diff --git a/trace-events b/trace-events
index 70f059d..db2cd39 100644
--- a/trace-events
+++ b/trace-events
@@ -726,7 +726,7 @@  ppm_save(const char *filename, void *display_surface) "%s surface=%p"
 # hw/qxl.c
 disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
 disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"
-qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"
+qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"
 qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"
 qxl_destroy_primary(int qid) "%d"
 qxl_enter_vga_mode(int qid) "%d"