diff options
author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-01-13 11:24:07 -0800 |
---|---|---|
committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-01-13 11:24:07 -0800 |
commit | 90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447 (patch) | |
tree | 18ca241d0b2b91acbc5b9a0ee1c8b7c79ace2988 /vl-android.c | |
parent | 3bf6efc0928555529c3df28d291117390b840c16 (diff) | |
download | external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.zip external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.tar.gz external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.tar.bz2 |
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
Diffstat (limited to 'vl-android.c')
-rw-r--r-- | vl-android.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/vl-android.c b/vl-android.c index 444461b..75b1bce 100644 --- a/vl-android.c +++ b/vl-android.c @@ -57,6 +57,7 @@ #include "android/globals.h" #include "android/utils/bufprint.h" #include "android/display-core.h" +#include "android/utils/timezone.h" #include "targphys.h" #include "tcpdump.h" @@ -387,6 +388,9 @@ char* android_op_ui_port = NULL; */ char* android_op_ui_settings = NULL; +/* -android-avdname option value. */ +char* android_op_avd_name = "unknown"; + extern int android_display_width; extern int android_display_height; extern int android_display_bpp; @@ -4572,6 +4576,17 @@ int main(int argc, char **argv, char **envp) android_audio_test_start_out(); break; + case QEMU_OPTION_android_avdname: + android_op_avd_name = (char*)optarg; + break; + + case QEMU_OPTION_timezone: + if (timezone_set((char*)optarg)) { + fprintf(stderr, "emulator: it seems the timezone '%s' is not in zoneinfo format\n", + (char*)optarg); + } + break; + #ifdef CONFIG_MEMCHECK case QEMU_OPTION_android_memcheck: android_op_memcheck = (char*)optarg; |