From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 5 Nov 2015 12:12:36 +0000 (+0900)
Subject: vl.c: do not use deprecated glib API g_mem_set_vtable()
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~8^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a13029dd9475320aaacd1de7e65fd6f5416b8b30;p=sdk%2Femulator%2Fqemu.git

vl.c: do not use deprecated glib API g_mem_set_vtable()

g_mem_set_vtable() has been deprecated since glib version 2.46. So,
compiler complain about it "-Wdeprecated-declarations".
We should not use g_mem_set_vtable() when glib is newer than 2.46.

Change-Id: I0fcf76fa1b18e544341c679307aa5418cf619367
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit 9bab3cf527a73a1b8c7bcb2c1ce6a0d905b625be)
---

diff --git a/vl.c b/vl.c
index 7d427441f8..516f7c0623 100644
--- a/vl.c
+++ b/vl.c
@@ -2908,6 +2908,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
     return popt;
 }
 
+#if !GLIB_CHECK_VERSION(2, 46, 0)
 static gpointer malloc_and_trace(gsize n_bytes)
 {
     void *ptr = malloc(n_bytes);
@@ -2927,6 +2928,7 @@ static void free_and_trace(gpointer mem)
     trace_g_free(mem);
     free(mem);
 }
+#endif
 
 static int object_set_property(const char *name, const char *value, void *opaque)
 {
@@ -3033,11 +3035,13 @@ int main(int argc, char **argv, char **envp)
     bool userconfig = true;
     const char *log_mask = NULL;
     const char *log_file = NULL;
+#if !GLIB_CHECK_VERSION(2, 46, 0)
     GMemVTable mem_trace = {
         .malloc = malloc_and_trace,
         .realloc = realloc_and_trace,
         .free = free_and_trace,
     };
+#endif
     const char *trace_events = NULL;
     const char *trace_file = NULL;
 
@@ -3045,7 +3049,9 @@ int main(int argc, char **argv, char **envp)
     error_set_progname(argv[0]);
     qemu_init_exec_dir(argv[0]);
 
+#if !GLIB_CHECK_VERSION(2, 46, 0)
     g_mem_set_vtable(&mem_trace);
+#endif
 
     module_call_init(MODULE_INIT_QOM);