aboutsummaryrefslogtreecommitdiffstats
path: root/android/main.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-03-18 00:02:14 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-03-18 00:02:14 +0100
commit5e736937d49affc9131944d7c879246fbcba3b70 (patch)
tree55e262bd9a6cc7b198e62c8287cfb16f1102bec3 /android/main.c
parenta9b371d7fa8f843718fb7db794fefd1e3765e459 (diff)
downloadexternal_qemu-5e736937d49affc9131944d7c879246fbcba3b70.zip
external_qemu-5e736937d49affc9131944d7c879246fbcba3b70.tar.gz
external_qemu-5e736937d49affc9131944d7c879246fbcba3b70.tar.bz2
Fix -shell and -logcat options.
They didn't work because the guest was trying to write to the wrong serial port. Change-Id: Ibd68c4b63d0808afcb0cfaffa07c35898e21df9a
Diffstat (limited to 'android/main.c')
-rw-r--r--android/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c
index acc91e6..7b6ea03 100644
--- a/android/main.c
+++ b/android/main.c
@@ -161,7 +161,11 @@ int main(int argc, char **argv)
char* args[128];
int n;
char* opt;
- int serial = 0;
+ /* The emulator always uses the first serial port for kernel messages
+ * and the second one for qemud. So start at the third if we need one
+ * for logcat or 'shell'
+ */
+ int serial = 2;
int shell_serial = 0;
AndroidHwConfig* hw;