From patchwork Sun Oct 21 16:48:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 193048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 03A772C008D for ; Mon, 22 Oct 2012 03:50:28 +1100 (EST) Received: from localhost ([::1]:47859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPyjK-0003Ac-8o for incoming@patchwork.ozlabs.org; Sun, 21 Oct 2012 12:50:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPyi4-0008Dz-M7 for qemu-devel@nongnu.org; Sun, 21 Oct 2012 12:49:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPyi2-0006ds-TU for qemu-devel@nongnu.org; Sun, 21 Oct 2012 12:49:08 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:32872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPyi2-0006dS-Cb for qemu-devel@nongnu.org; Sun, 21 Oct 2012 12:49:06 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 22 Oct 2012 02:46:21 +1000 Received: from d23relay05.au.ibm.com (202.81.31.247) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 22 Oct 2012 02:46:20 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9LGcuIM55181548 for ; Mon, 22 Oct 2012 03:38:56 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9LGmx4K006916 for ; Mon, 22 Oct 2012 03:48:59 +1100 Received: from localhost.localdomain ([9.125.26.190]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q9LGmfmf006719; Mon, 22 Oct 2012 03:48:57 +1100 From: Lei Li To: qemu-devel@nongnu.org Date: Mon, 22 Oct 2012 00:48:01 +0800 Message-Id: <1350838081-6351-6-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1350838081-6351-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1350838081-6351-1-git-send-email-lilei@linux.vnet.ibm.com> x-cbid: 12102116-5490-0000-0000-0000025238DD X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.144 Cc: blauwirbel@gmail.com, aliguori@us.ibm.com, Lei Li , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 5/5] HMP: Introduce console command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lei Li --- hmp-commands.hx | 23 +++++++++++++++++++++++ hmp.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ hmp.h | 1 + monitor.c | 15 +++++++++++++++ monitor.h | 3 +++ 5 files changed, 95 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 5f91428..f862a53 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -868,7 +868,30 @@ char device and return @var{size} of the data. that specifies behavior when the queue is full/empty. By default is 'drop'. Note that the 'block' option is not supported now. -b for 'block' option. None for 'drop' option. +ETEXI + + { + .name = "console", + .args_type = "chardev:s", + .params = "chardev", + .help = "Connect to the serial console from within the" + "monitor, allow to write data to memchardev" + "'chardev'. Exit from the console and return back" + "to monitor by typing 'ctrl-]'", + .mhandler.cmd = hmp_console, + }, +STEXI +@item console @var{device} +@findex 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 typing 'ctrl-]'. +@example +(qemu) console foo +foo: data string... +@end example ETEXI { diff --git a/hmp.c b/hmp.c index fa858c4..bc245f4 100644 --- a/hmp.c +++ b/hmp.c @@ -1245,3 +1245,56 @@ void hmp_screen_dump(Monitor *mon, const QDict *qdict) qmp_screendump(filename, &err); hmp_handle_error(mon, &err); } + +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 DataFormat format = DATA_FORMAT_UTF8; + enum CongestionControl control = CONGESTION_CONTROL_DROP; + 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, format, + 0, control, &err); + if (err) { + monitor_printf(mon, "%s\n", error_get_pretty(err)); + 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 a5a0cfe..5b54a79 100644 --- a/hmp.h +++ b/hmp.h @@ -77,5 +77,6 @@ void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_send_key(Monitor *mon, const QDict *qdict); void hmp_screen_dump(Monitor *mon, const QDict *qdict); +void hmp_console(Monitor *mon, const QDict *qdict); #endif diff --git a/monitor.c b/monitor.c index 131b325..453c084 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 b6e7d95..735bd1b 100644 --- a/monitor.h +++ b/monitor.h @@ -86,6 +86,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);