Refining main-ui.c to better separate UI and core related initialization
The main reason for this is to clarify initialization for UI that starts core,
and UI that attaches to an existing core. In this CL I did:
- Removed -initdata option that seems obsolete (doesn't affect anything in the code)
- Passed through -timezone option that doesn't affect anything in the UI, and is needed
only in the core.
- Removed dependency on AVD info from the core (core needed only virtual device name)
Change-Id: Ie631249848a1b5b8d837c0c7b201a40ee7e4a367
diff --git a/android/console.c b/android/console.c
index a89d0e1..a44d831 100644
--- a/android/console.c
+++ b/android/console.c
@@ -121,6 +121,9 @@
ControlClient framebuffer_client = NULL;
#endif // CONFIG_STANDALONE_CORE
+/* -android-avdname option value. Defined in vl-android.c */
+extern char* android_op_avd_name;
+
static int
control_global_add_redir( ControlGlobal global,
int host_port,
@@ -2170,7 +2173,7 @@
static int
do_avd_name( ControlClient client, char* args )
{
- control_write( client, "%s\r\n", avdInfo_getName(android_avdInfo) );
+ control_write( client, "%s\r\n", android_op_avd_name);
return 0;
}