From a74cd8cc37896402a1793217d5059a0b0489155a Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Wed, 31 Aug 2011 09:25:35 +0200 Subject: [PATCH] rename qemu_malloc and related to glib names for coherence Reviewed-by: Stefan Hajnoczi Signed-off-by: Frediano Ziglio Signed-off-by: Anthony Liguori --- trace-events | 8 ++++---- vl.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trace-events b/trace-events index 98f3ec2841..08ffedfdd1 100644 --- a/trace-events +++ b/trace-events @@ -14,7 +14,7 @@ # # [disable] ( [, ] ...) "" # -# Example: qemu_malloc(size_t size) "size %zu" +# Example: g_malloc(size_t size) "size %zu" # # The "disable" keyword will build without the trace event. # @@ -26,9 +26,9 @@ # The should be a sprintf()-compatible format string. # qemu-malloc.c -qemu_malloc(size_t size, void *ptr) "size %zu ptr %p" -qemu_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p" -qemu_free(void *ptr) "ptr %p" +g_malloc(size_t size, void *ptr) "size %zu ptr %p" +g_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p" +g_free(void *ptr) "ptr %p" # osdep.c qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu size %zu ptr %p" diff --git a/vl.c b/vl.c index 7a6fbacee5..5ba9b35860 100644 --- a/vl.c +++ b/vl.c @@ -2144,20 +2144,20 @@ static const QEMUOption *lookup_opt(int argc, char **argv, static gpointer malloc_and_trace(gsize n_bytes) { void *ptr = malloc(n_bytes); - trace_qemu_malloc(n_bytes, ptr); + trace_g_malloc(n_bytes, ptr); return ptr; } static gpointer realloc_and_trace(gpointer mem, gsize n_bytes) { void *ptr = realloc(mem, n_bytes); - trace_qemu_realloc(mem, n_bytes, ptr); + trace_g_realloc(mem, n_bytes, ptr); return ptr; } static void free_and_trace(gpointer mem) { - trace_qemu_free(mem); + trace_g_free(mem); free(mem); }