commit b5365f32d7b1dcc6c3e9be7584ce8d4f68b3e7e1
author Vladimir Chtchetkine <vchtchetkine@google.com> Mon Aug 09 13:33:57 2010 -0700
committer Vladimir Chtchetkine <vchtchetkine@google.com> Mon Aug 09 13:33:57 2010 -0700
tree 16b50a07212fa0d4a08ea28e361701aa0cb17732
parent 074d1f955a15c19214cee92c627c8c4697e98cd3

Move memchecker initialization from main.c to vl-android.c (core)

Also move qemu-malloc.c to common CORE and UI sources

Change-Id: Ifd62ae247cc03700d85b5fc35072d73ac37cc570

vl-android.c

diff --git a/vl-android.c b/vl-android.c
index fa32b79..12627fd 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -57,6 +57,10 @@
 #include "android/globals.h"
 #include "targphys.h"
 
+#ifdef CONFIG_MEMCHECK
+#include "memcheck/memcheck.h"
+#endif  // CONFIG_MEMCHECK
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -344,6 +348,9 @@
 /* Path to hardware initialization file passed with -android-hw option. */
 char* android_op_hwini = NULL;
 
+/* Memory checker options. */
+char* android_op_memcheck = NULL;
+
 extern int android_display_width;
 extern int android_display_height;
 extern int android_display_bpp;
@@ -5813,6 +5820,11 @@
             case QEMU_OPTION_android_hw:
                 android_op_hwini = (char*)optarg;
                 break;
+#ifdef CONFIG_MEMCHECK
+            case QEMU_OPTION_android_memcheck:
+                android_op_memcheck = (char*)optarg;
+                break;
+#endif // CONFIG_MEMCHECK
             }
         }
     }
@@ -5856,6 +5868,12 @@
     iniFile_free(hw_ini);
 #endif  // CONFIG_STANDALONE_CORE
 
+#ifdef CONFIG_MEMCHECK
+    if (android_op_memcheck) {
+        memcheck_init(android_op_memcheck);
+    }
+#endif  // CONFIG_MEMCHECK
+
 #if defined(CONFIG_KVM) && defined(CONFIG_KQEMU)
     if (kvm_allowed && kqemu_allowed) {
         fprintf(stderr,