From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXvGA-0008WI-2w for qemu-devel@nongnu.org; Fri, 04 Sep 2015 13:58:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXvG6-0005Sc-QQ for qemu-devel@nongnu.org; Fri, 04 Sep 2015 13:58:46 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:34173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXvG6-0005RZ-LG for qemu-devel@nongnu.org; Fri, 04 Sep 2015 13:58:42 -0400 Received: from h2.hallyn.com ([78.46.35.8] helo=ubuntumail) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ZXvG5-00084Z-Kw for qemu-devel@nongnu.org; Fri, 04 Sep 2015 17:58:41 +0000 Date: Fri, 4 Sep 2015 17:58:40 +0000 From: Serge Hallyn Message-ID: <20150904175840.GA30773@ubuntumail> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH 1/1] vl.c: don't try to insert malloc tracepoints on newer glib List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers 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 as reported at https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/1491972 (thanks danpb for the suggestion) Signed-off-by: Serge Hallyn --- vl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vl.c b/vl.c index 584ca88..cab9425 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); @@ -2738,6 +2739,7 @@ static void free_and_trace(gpointer mem) trace_g_free(mem); free(mem); } +#endif static int machine_set_property(void *opaque, const char *name, const char *value, @@ -2966,11 +2968,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, 44, 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; ram_addr_t maxram_size; @@ -2986,7 +2990,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, 44, 0) g_mem_set_vtable(&mem_trace); +#endif module_call_init(MODULE_INIT_QOM); -- 2.5.0