| Message ID | 1369045989-14016-1-git-send-email-hpoussin@reactos.org |
|---|---|
| State | New |
| Headers | show |
Am 20.05.2013 12:33, schrieb Hervé Poussineau: > Commit e7a09b92b70786f9e8c5fbf787e0248c6ebbe707 added a trace at each > memory freeing, but unfortunately inverted size and pointer when printing > them. Fix trace. > > This also led to a compilation error on 32 bit hosts: > In file included from include/trace.h:4:0, > from trace/generated-events.c:3: > ./trace/generated-tracers.h: In function ‘trace_qemu_anon_ram_free’: > ./trace/generated-tracers.h:64:9: error: format ‘%zu’ expects argument of type > ‘size_t’, but argument 3 has type ‘void *’ [-Werror=format] > ./trace/generated-tracers.h:64:9: error: format ‘%p’ expects argument of type > ‘void *’, but argument 4 has type ‘size_t’ [-Werror=format] > > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > --- > trace-events | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/trace-events b/trace-events > index c03b9cb..9c73931 100644 > --- a/trace-events > +++ b/trace-events > @@ -34,7 +34,7 @@ g_free(void *ptr) "ptr %p" > qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu size %zu ptr %p" > qemu_anon_ram_alloc(size_t size, void *ptr) "size %zu ptr %p" > qemu_vfree(void *ptr) "ptr %p" > -qemu_anon_ram_free(void *ptr, size_t size) "size %zu ptr %p" > +qemu_anon_ram_free(void *ptr, size_t size) "ptr %p size %zu" > > # hw/virtio.c > virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int idx) "vq %p elem %p len %u idx %u" See http://patchwork.ozlabs.org/patch/244757/ which also fixes that code. Regards, Stefan Weil
Applied. Thanks. Regards, Anthony Liguori
diff --git a/trace-events b/trace-events index c03b9cb..9c73931 100644 --- a/trace-events +++ b/trace-events @@ -34,7 +34,7 @@ g_free(void *ptr) "ptr %p" qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu size %zu ptr %p" qemu_anon_ram_alloc(size_t size, void *ptr) "size %zu ptr %p" qemu_vfree(void *ptr) "ptr %p" -qemu_anon_ram_free(void *ptr, size_t size) "size %zu ptr %p" +qemu_anon_ram_free(void *ptr, size_t size) "ptr %p size %zu" # hw/virtio.c virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int idx) "vq %p elem %p len %u idx %u"
Commit e7a09b92b70786f9e8c5fbf787e0248c6ebbe707 added a trace at each memory freeing, but unfortunately inverted size and pointer when printing them. Fix trace. This also led to a compilation error on 32 bit hosts: In file included from include/trace.h:4:0, from trace/generated-events.c:3: ./trace/generated-tracers.h: In function ‘trace_qemu_anon_ram_free’: ./trace/generated-tracers.h:64:9: error: format ‘%zu’ expects argument of type ‘size_t’, but argument 3 has type ‘void *’ [-Werror=format] ./trace/generated-tracers.h:64:9: error: format ‘%p’ expects argument of type ‘void *’, but argument 4 has type ‘size_t’ [-Werror=format] Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)