[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/4] HMP: Introduce console command
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 4/4] HMP: Introduce console command |
Date: |
Thu, 6 Dec 2012 22:56:40 +0800 |
Signed-off-by: Lei Li <address@hidden>
---
hmp-commands.hx | 21 +++++++++++++++++++++
hmp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
hmp.h | 1 +
monitor.c | 15 +++++++++++++++
monitor.h | 3 +++
5 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3975e22..9ec5ed7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -874,6 +874,27 @@ if the requested size is larger than it.
ETEXI
{
+ .name = "console",
+ .args_type = "chardev:s",
+ .params = "chardev",
+ .mhandler.cmd = hmp_console,
+ },
+
+STEXI
address@hidden console @var{device}
address@hidden console
+Connect to the serial console from within the monitor, allow to write data
+to memchardev @var{chardev}. Exit from the console and return back to
+monitor by 'ctrl-]' or enter.
+
address@hidden
+(qemu) console foo
+foo: data string...
address@hidden example
+
+ETEXI
+
+ {
.name = "migrate",
.args_type = "detach:-d,blk:-b,inc:-i,uri:s",
.params = "[-d] [-b] [-i] uri",
diff --git a/hmp.c b/hmp.c
index 413012f..a6c053c 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1365,3 +1365,55 @@ void hmp_nbd_server_stop(Monitor *mon, const QDict
*qdict)
qmp_nbd_server_stop(&errp);
hmp_handle_error(mon, &errp);
}
+
+enum escape_char
+{
+ ESCAPE_CHAR_CTRL_GS = 0x1d /* ctrl-] used for escape */
+};
+
+static void hmp_read_console(Monitor *mon, const char *data,
+ void *opaque)
+{
+ CharDriverState *chr = opaque;
+ uint32_t size = strlen(data);
+ enum escape_char console_escape = ESCAPE_CHAR_CTRL_GS;
+
+ Error *err = NULL;
+
+ if (*data == console_escape) {
+ monitor_resume(mon);
+ return;
+ }
+
+ qmp_memchar_write(chr->label, size, data, 0, 0, &err);
+
+ if (err) {
+ monitor_printf(mon, "%s\n", error_get_pretty(err));
+ monitor_read_command(mon,1);
+ error_free(err);
+ return;
+ }
+
+ monitor_read_command(mon, 1);
+}
+
+void hmp_console(Monitor *mon, const QDict *qdict)
+{
+ const char *device = qdict_get_str(qdict, "chardev");
+ CharDriverState *chr;
+ Error *err = NULL;
+
+ chr = qemu_chr_find(device);
+
+ if (!chr) {
+ error_set(&err, QERR_DEVICE_NOT_FOUND, device);
+ goto out;
+ }
+
+ if (monitor_read_console(mon, device, hmp_read_console, chr) < 0) {
+ monitor_printf(mon, "Connect to console %s failed\n", device);
+ }
+
+out:
+ hmp_handle_error(mon, &err);
+}
diff --git a/hmp.h b/hmp.h
index 22a6646..9082324 100644
--- a/hmp.h
+++ b/hmp.h
@@ -82,5 +82,6 @@ void hmp_screen_dump(Monitor *mon, const QDict *qdict);
void hmp_nbd_server_start(Monitor *mon, const QDict *qdict);
void hmp_nbd_server_add(Monitor *mon, const QDict *qdict);
void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict);
+void hmp_console(Monitor *mon, const QDict *qdict);
#endif
diff --git a/monitor.c b/monitor.c
index c0e32d6..695a19a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -256,6 +256,21 @@ int monitor_read_password(Monitor *mon, ReadLineFunc
*readline_func,
}
}
+int monitor_read_console(Monitor *mon, const char *device,
+ ReadLineFunc *readline_func, void *opaque)
+{
+ char prompt[60];
+
+ if (!mon->rs) {
+ return -1;
+ }
+
+ snprintf(prompt, sizeof(prompt), "%s: ", device);
+ readline_start(mon->rs, prompt, 0, readline_func, opaque);
+
+ return 0;
+}
+
void monitor_flush(Monitor *mon)
{
if (mon && mon->outbuf_index != 0 && !mon->mux_out) {
diff --git a/monitor.h b/monitor.h
index b4ef955..5f584b9 100644
--- a/monitor.h
+++ b/monitor.h
@@ -87,6 +87,9 @@ ReadLineState *monitor_get_rs(Monitor *mon);
int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
void *opaque);
+int monitor_read_console(Monitor *mon, const char *device,
+ ReadLineFunc *readline_func, void *opaque);
+
int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret);
int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret);
--
1.7.7.6