Commit a74cd8cc authored by Frediano Ziglio's avatar Frediano Ziglio Committed by Anthony Liguori
Browse files

rename qemu_malloc and related to glib names for coherence 



Reviewed-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarFrediano Ziglio <freddy77@gmail.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1901cb14

trace-events

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#

# [disable] <name>(<type1> <arg1>[, <type2> <arg2>] ...) "<format-string>"

#

# 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 <format-string> 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"

vl.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}