aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-01-19 13:33:00 -0800
committerAndroid Code Review <code-review@android.com>2011-01-19 13:33:00 -0800
commit8856170ee5fa7d8443501e7ac972a27597dea9f5 (patch)
tree820ad9696a7eb645535946c9f9b62dbbec0f5728
parent5bfd3974787f84703db2356680e314688005a17c (diff)
parent3336176fc898915b7b5544f3a7c60ec2794507c3 (diff)
downloadexternal_qemu-8856170ee5fa7d8443501e7ac972a27597dea9f5.zip
external_qemu-8856170ee5fa7d8443501e7ac972a27597dea9f5.tar.gz
external_qemu-8856170ee5fa7d8443501e7ac972a27597dea9f5.tar.bz2
Merge "Print concatenated QEMU options with -verbose."
-rw-r--r--android/main-ui.c9
-rw-r--r--android/main.c9
2 files changed, 16 insertions, 2 deletions
diff --git a/android/main-ui.c b/android/main-ui.c
index a48c0fc..8b9e088 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -1927,9 +1927,16 @@ int main(int argc, char **argv)
if(VERBOSE_CHECK(init)) {
int i;
+ printf("QEMU options list:\n");
for(i = 0; i < n; i++) {
- fprintf(stdout, "emulator: argv[%02d] = \"%s\"\n", i, args[i]);
+ printf("emulator: argv[%02d] = \"%s\"\n", i, args[i]);
}
+ /* Dump final command-line option to make debugging the core easier */
+ printf("Concatenated QEMU options:\n");
+ for (i = 0; i < n; i++) {
+ printf(" %s", args[i]);
+ }
+ printf("\n");
}
return qemu_main(n, args);
}
diff --git a/android/main.c b/android/main.c
index 00d54d1..5968249 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1691,9 +1691,16 @@ int main(int argc, char **argv)
if(VERBOSE_CHECK(init)) {
int i;
+ printf("QEMU options list:\n");
for(i = 0; i < n; i++) {
- fprintf(stdout, "emulator: argv[%02d] = \"%s\"\n", i, args[i]);
+ printf("emulator: argv[%02d] = \"%s\"\n", i, args[i]);
}
+ /* Dump final command-line option to make debugging the core easier */
+ printf("Concatenated QEMU options:\n");
+ for (i = 0; i < n; i++) {
+ printf(" %s", args[i]);
+ }
+ printf("\n");
}
return qemu_main(n, args);
}