Patchwork qxl: fix compilation failure on 32 bit hosts

login
register
mail settings
Submitter Hervé Poussineau
Date March 24, 2012, 10:56 p.m.
Message ID <1332629775-15200-1-git-send-email-hpoussin@reactos.org>
Download mbox | patch
Permalink /patch/148550/
State New
Headers show

Comments

Hervé Poussineau - March 24, 2012, 10:56 p.m.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 trace-events |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andreas Färber - March 24, 2012, 11:21 p.m.
Am 24.03.2012 23:56, schrieb Hervé Poussineau:
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Cf. http://patchwork.ozlabs.org/patch/148493/ - looks identical.

Andreas

> ---
>  trace-events |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/trace-events b/trace-events
> index 70f059d..8fa1c1c 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 %dx%d mem=%"PRIx64" %d,%d"
>  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"

Patch

diff --git a/trace-events b/trace-events
index 70f059d..8fa1c1c 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 %dx%d mem=%"PRIx64" %d,%d"
 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"