aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-17 04:28:19 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-02-17 04:30:08 +0100
commit6b8555cac04862908bf6c64565061f2c8e871ad7 (patch)
tree49a00597ba3d1d511d5c68d6cd00a290f9bf44f1 /android
parent2f122ee6bb35f967031f4b8645486b180e2b42e0 (diff)
downloadexternal_qemu-6b8555cac04862908bf6c64565061f2c8e871ad7.zip
external_qemu-6b8555cac04862908bf6c64565061f2c8e871ad7.tar.gz
external_qemu-6b8555cac04862908bf6c64565061f2c8e871ad7.tar.bz2
Fix "avd name" bug.
The console's 'avd name' command returned "unknown" incorrectly. This was due to a missing option when invoking the core, even in the standalone case. Fixes bug 3454261 Change-Id: I7efcfc50792231f57dc76d3c11e7968faf057e12 NOTE: This is a quick fix for tools_r10. A proper fix should instead move the AVD name to auto-generated qemu-hardware.ini instead of using a core command-line option.
Diffstat (limited to 'android')
-rw-r--r--android/main-ui.c3
-rw-r--r--android/main.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/android/main-ui.c b/android/main-ui.c
index ca83a9a..273f402 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -1432,6 +1432,9 @@ int main(int argc, char **argv)
args[n++] = "unix";
#endif
+ args[n++] = "-android-avdname";
+ args[n++] = avdInfo_getName(avd);
+
/* Set up the interfaces for inter-emulator networking */
if (opts->shared_net_id) {
unsigned int shared_net_id = atoi(opts->shared_net_id);
diff --git a/android/main.c b/android/main.c
index 919810b..51ef6d7 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1229,6 +1229,9 @@ int main(int argc, char **argv)
args[n++] = "unix";
#endif
+ args[n++] = "-android-avdname";
+ args[n++] = avdInfo_getName(avd);
+
/* Set up the interfaces for inter-emulator networking */
if (opts->shared_net_id) {
unsigned int shared_net_id = atoi(opts->shared_net_id);