[Qemu-devel] [PATCH] vl.c: don't try to insert malloc tracepoints on newer glib (v2)

[Serge Hallyn]

Because it has deprecated it with commit
3be6ed60aa58095691bd697344765e715a327fc1.  This prevents the warning

(process:3535): GLib-WARNING **: 
/build/glib2.0-3tdlHy/glib2.0-2.45.6/./glib/gmem.c:482: custom memory 
allocation vtable not supported

Changelog (v2): consolidate #ifdefs

Signed-off-by: Serge Hallyn <address@hidden>
---
 vl.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/vl.c b/vl.c
index 584ca88..6a69027 100644
--- a/vl.c
+++ b/vl.c
@@ -2719,6 +2719,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
     return popt;
 }
 
+#if !GLIB_CHECK_VERSION(2, 44, 0)
 static gpointer malloc_and_trace(gsize n_bytes)
 {
     void *ptr = malloc(n_bytes);
@@ -2739,6 +2740,25 @@ static void free_and_trace(gpointer mem)
     free(mem);
 }
 
+static void register_glib_mem_trace_functions(void)
+{
+    GMemVTable mem_trace = {
+        .malloc = malloc_and_trace,
+        .realloc = realloc_and_trace,
+        .free = free_and_trace,
+    };
+
+    g_mem_set_vtable(&mem_trace);
+}
+#else
+static void register_glib_mem_trace_functions(void)
+{
+    /* Newer versions of glib don't support intercepting the
+     * memory allocation functions.
+     */
+}
+#endif
+
 static int machine_set_property(void *opaque,
                                 const char *name, const char *value,
                                 Error **errp)
@@ -2966,11 +2986,6 @@ int main(int argc, char **argv, char **envp)
     bool userconfig = true;
     const char *log_mask = NULL;
     const char *log_file = NULL;
-    GMemVTable mem_trace = {
-        .malloc = malloc_and_trace,
-        .realloc = realloc_and_trace,
-        .free = free_and_trace,
-    };
     const char *trace_events = NULL;
     const char *trace_file = NULL;
     ram_addr_t maxram_size;
@@ -2986,7 +3001,7 @@ int main(int argc, char **argv, char **envp)
     error_set_progname(argv[0]);
     qemu_init_exec_dir(argv[0]);
 
-    g_mem_set_vtable(&mem_trace);
+    register_glib_mem_trace_functions();
 
     module_call_init(MODULE_INIT_QOM);
 
-- 
2.5.0