aboutsummaryrefslogtreecommitdiffstats
path: root/vl-android.c
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-01-20 16:15:30 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-01-20 16:15:30 -0800
commit5758404ffd1be160efa303ff27eef645fc4e2c2d (patch)
tree93f45fc8059709d2ee824f3b7493698867238a86 /vl-android.c
parent20722c5f401f6d26ca26f12611b40c5ba4ea961f (diff)
downloadexternal_qemu-5758404ffd1be160efa303ff27eef645fc4e2c2d.zip
external_qemu-5758404ffd1be160efa303ff27eef645fc4e2c2d.tar.gz
external_qemu-5758404ffd1be160efa303ff27eef645fc4e2c2d.tar.bz2
Remove unnecessary calls in UI <-> Core protocols.
Core port related calls are no longer needed, since UI is aware of core's base port on attachment to the core Change-Id: Ic211fc9b02cb652009360f80917e90c44d941878
Diffstat (limited to 'vl-android.c')
-rw-r--r--vl-android.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/vl-android.c b/vl-android.c
index af17c33..60c3a01 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -199,6 +199,11 @@
unsigned long android_verbose;
#endif // CONFIG_STANDALONE_CORE
+#if !defined(CONFIG_STANDALONE_CORE)
+/* in android/qemulator.c */
+extern void android_emulator_set_base_port(int port);
+#endif
+
#if defined(CONFIG_SKINS) && !defined(CONFIG_STANDALONE_CORE)
#undef main
#define main qemu_main
@@ -5302,6 +5307,12 @@ int main(int argc, char **argv, char **envp)
/* call android-specific setup function */
android_emulation_setup();
+#if !defined(CONFIG_STANDALONE_CORE)
+ // For the standalone emulator (UI+core in one executable) we need to
+ // set the window title here.
+ android_emulator_set_base_port(android_base_port);
+#endif
+
if (loadvm)
do_loadvm(cur_mon, loadvm);