From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVsS-00033c-7l for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:41:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzVsR-00024T-86 for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:41:56 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:47706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVsR-00023r-3D for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:41:55 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p82F7Vmw012269 for ; Fri, 2 Sep 2011 11:07:31 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p82FeUNM2633766 for ; Fri, 2 Sep 2011 11:40:31 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p82BeHmF019320 for ; Fri, 2 Sep 2011 08:40:17 -0300 Message-ID: <4E60F8ED.10606@us.ibm.com> Date: Fri, 02 Sep 2011 10:40:29 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1314775535-5736-1-git-send-email-freddy77@gmail.com> In-Reply-To: <1314775535-5736-1-git-send-email-freddy77@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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: Frediano Ziglio Cc: qemu-devel@nongnu.org On 08/31/2011 02:25 AM, Frediano Ziglio wrote: > Signed-off-by: Frediano Ziglio Applied. Thanks. Regards, Anthony Liguori > --- > 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); > } >