From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QyfAa-0000mM-F1 for qemu-devel@nongnu.org; Wed, 31 Aug 2011 03:25:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QyfAY-0003MI-Tf for qemu-devel@nongnu.org; Wed, 31 Aug 2011 03:25:08 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:38747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QyfAY-0003Lb-Nl for qemu-devel@nongnu.org; Wed, 31 Aug 2011 03:25:06 -0400 Received: by ewy24 with SMTP id 24so240030ewy.4 for ; Wed, 31 Aug 2011 00:25:05 -0700 (PDT) From: Frediano Ziglio Date: Wed, 31 Aug 2011 09:25:35 +0200 Message-Id: <1314775535-5736-1-git-send-email-freddy77@gmail.com> Subject: [Qemu-devel] [PATCH] rename qemu_malloc and related to glib names for coherence List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org, Frediano Ziglio Signed-off-by: Frediano Ziglio --- trace-events | 10 +++++----- vl.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/trace-events b/trace-events index dc300a2..37da2e0 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. # In case of 'simple' trace backend, it will allow the trace event to be @@ -28,10 +28,10 @@ # # The should be a sprintf()-compatible format string. -# qemu-malloc.c -disable qemu_malloc(size_t size, void *ptr) "size %zu ptr %p" -disable qemu_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p" -disable qemu_free(void *ptr) "ptr %p" +# vl.c +disable g_malloc(size_t size, void *ptr) "size %zu ptr %p" +disable g_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p" +disable g_free(void *ptr) "ptr %p" # osdep.c disable 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 9cd67a3..f71221b 100644 --- a/vl.c +++ b/vl.c @@ -2088,20 +2088,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); } -- 1.7.1