aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Bellows <greg.bellows@linaro.org>2014-11-19 09:21:19 -0600
committerAlex Bennée <alex.bennee@linaro.org>2015-01-07 11:36:06 +0000
commit06e3ac43c0681f0830ec79b761026947efa04f50 (patch)
treed74a235579360be4bc23c8b3371bd8c5ea94051d
parent361f6ad21f207f1882457cfe7347a6288c0f1b31 (diff)
downloadqemu-android-06e3ac43c0681f0830ec79b761026947efa04f50.tar.gz
android-console: Add avd name command stub
Add stub functionality to support the Android emulator console "avd name" command. The proper help messages are displayed, but the command currently returns a message indicating that AVDs are unsupported. Signed-off-by: Greg Bellows <greg.bellows@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-rw-r--r--android-commands.h7
-rw-r--r--android-console.c10
-rw-r--r--android-console.h1
3 files changed, 18 insertions, 0 deletions
diff --git a/android-commands.h b/android-commands.h
index ca4052a8ce..9b0f5a91c7 100644
--- a/android-commands.h
+++ b/android-commands.h
@@ -125,6 +125,13 @@ static mon_cmd_t android_avd_cmds[] = {
.help = "query virtual device status",
.mhandler.cmd = android_console_avd_status,
},
+ {
+ .name = "name",
+ .args_type = "",
+ .params = "",
+ .help = "query virtual device name",
+ .mhandler.cmd = android_console_avd_name,
+ },
{ NULL, NULL, },
};
diff --git a/android-console.c b/android-console.c
index 15e6288117..595df065e0 100644
--- a/android-console.c
+++ b/android-console.c
@@ -734,6 +734,7 @@ enum {
CMD_AVD_STOP,
CMD_AVD_START,
CMD_AVD_STATUS,
+ CMD_AVD_NAME,
};
static const char *avd_help[] = {
@@ -755,6 +756,8 @@ static const char *avd_help[] = {
"stop it",
/* CMD_AVD_STATUS */
"'avd status' will indicate whether the virtual device is running or not",
+ /* CMD_AVD_NAME */
+ "'avd name' will return the name of this virtual device",
};
void android_console_avd_stop(Monitor *mon, const QDict *qdict)
@@ -789,6 +792,11 @@ void android_console_avd_status(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "OK\n");
}
+void android_console_avd_name(Monitor *mon, const QDict *qdict)
+{
+ monitor_printf(mon, "KO: 'avd name' is currently unsupported\n");
+}
+
void android_console_avd(Monitor *mon, const QDict *qdict)
{
/* This only gets called for bad subcommands and help requests */
@@ -804,6 +812,8 @@ void android_console_avd(Monitor *mon, const QDict *qdict)
cmd = CMD_AVD_START;
} else if (strstr(helptext, "status")) {
cmd = CMD_AVD_STATUS;
+ } else if (strstr(helptext, "name")) {
+ cmd = CMD_AVD_NAME;
}
}
diff --git a/android-console.h b/android-console.h
index 36a4090ce8..c92045747a 100644
--- a/android-console.h
+++ b/android-console.h
@@ -45,6 +45,7 @@ void android_console_event(Monitor *mon, const QDict *qdict);
void android_console_avd_stop(Monitor *mon, const QDict *qdict);
void android_console_avd_start(Monitor *mon, const QDict *qdict);
void android_console_avd_status(Monitor *mon, const QDict *qdict);
+void android_console_avd_name(Monitor *mon, const QDict *qdict);
void android_console_avd(Monitor *mon, const QDict *qdict);
void android_monitor_print_error(Monitor *mon, const char *fmt, ...);