commit eb8382507c6b802f378cf940fae4775633c1d84e
author Vladimir Chtchetkine <vchtchetkine@google.com> Thu Jul 15 12:27:56 2010 -0700
committer Vladimir Chtchetkine <vchtchetkine@google.com> Thu Jul 15 12:27:56 2010 -0700
tree d5974956e7487b2cb3af339abff2139d28e4b091
parent 7258f6b1539906849d02fa9f5e75360b0d01f48c

Move net-related routines from main.c to net-android.c

Change-Id: If102220e6db913f4a51bb1809ce60f4bf24bdd6a

vl-android.c

diff --git a/vl-android.c b/vl-android.c
index 4a373b3..1673426 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -53,6 +53,7 @@
 #include "android/gps.h"
 #include "android/hw-qemud.h"
 #include "android/hw-kmsg.h"
+#include "android/charmap.h"
 #include "targphys.h"
 
 #include <unistd.h>
@@ -180,6 +181,11 @@
 #include "kvm.h"
 #include "balloon.h"
 
+#ifdef CONFIG_STANDALONE_CORE
+/* Verbose value used by the standalone emulator core (without UI) */
+unsigned long   android_verbose;
+#endif  // CONFIG_STANDALONE_CORE
+
 #ifdef CONFIG_SKINS
 #undef main
 #define main qemu_main
@@ -6168,7 +6174,7 @@
         curses_display_init(ds, full_screen);
         break;
 #endif
-#if defined(CONFIG_SDL)
+#if defined(CONFIG_SDL) && !defined(CONFIG_STANDALONE_CORE)
     case DT_SDL:
         sdl_display_init(ds, full_screen, no_frame);
         break;
@@ -6326,3 +6332,9 @@
     android_emulation_teardown();
     return 0;
 }
+
+void
+android_emulation_teardown(void)
+{
+    android_charmap_done();
+}