From nobody Wed Nov 5 13:43:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497167402995400.326812614725; Sun, 11 Jun 2017 00:50:02 -0700 (PDT) Received: from localhost ([::1]:33131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJxdH-0008IJ-JO for importer@patchew.org; Sun, 11 Jun 2017 03:49:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJxcP-0007zv-Qs for qemu-devel@nongnu.org; Sun, 11 Jun 2017 03:49:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJxcO-0008UP-Ix for qemu-devel@nongnu.org; Sun, 11 Jun 2017 03:49:05 -0400 Received: from manul.sfritsch.de ([2a01:4f8:172:195f:112::2]:40022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJxcO-0008Sw-Ba for qemu-devel@nongnu.org; Sun, 11 Jun 2017 03:49:04 -0400 From: Stefan Fritsch To: qemu-devel@nongnu.org Date: Sun, 11 Jun 2017 09:48:17 +0200 Message-Id: <20170611074817.13621-1-sf@sfritsch.de> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:4f8:172:195f:112::2 Subject: [Qemu-devel] [PATCH v2] Add chardev-send-break monitor command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Stefan Fritsch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Sending a break on a serial console can be useful for debugging the guest. But not all chardev backends support sending breaks (only telnet and mux do). The chardev-send-break command allows to send a break even if using other backends. Signed-off-by: Stefan Fritsch Acked-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake --- v2: added tests and Acked-by line chardev/char.c | 12 ++++++++++++ hmp-commands.hx | 16 ++++++++++++++++ hmp.c | 8 ++++++++ hmp.h | 1 + qapi-schema.json | 20 ++++++++++++++++++++ tests/test-char.c | 12 ++++++++++-- tests/test-hmp.c | 1 + 7 files changed, 68 insertions(+), 2 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 7aa0210765..cc56bca672 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -951,6 +951,18 @@ void qmp_chardev_remove(const char *id, Error **errp) object_unparent(OBJECT(chr)); } =20 +void qmp_chardev_send_break(const char *id, Error **errp) +{ + Chardev *chr; + + chr =3D qemu_chr_find(id); + if (chr =3D=3D NULL) { + error_setg(errp, "Chardev '%s' not found", id); + return; + } + qemu_chr_be_event(chr, CHR_EVENT_BREAK); +} + void qemu_chr_cleanup(void) { object_unparent(get_chardevs_root()); diff --git a/hmp-commands.hx b/hmp-commands.hx index e763606fe5..fc8d54b52a 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1745,6 +1745,22 @@ Removes the chardev @var{id}. ETEXI =20 { + .name =3D "chardev-send-break", + .args_type =3D "id:s", + .params =3D "id", + .help =3D "send break on chardev", + .cmd =3D hmp_chardev_send_break, + .command_completion =3D chardev_remove_completion, + }, + +STEXI +@item chardev-send-break id +@findex chardev-send-break +Sends break on the chardev @var{id}. + +ETEXI + + { .name =3D "qemu-io", .args_type =3D "device:B,command:s", .params =3D "[device] \"[command]\"", diff --git a/hmp.c b/hmp.c index 8c72c58b20..94cafe970e 100644 --- a/hmp.c +++ b/hmp.c @@ -2233,6 +2233,14 @@ void hmp_chardev_remove(Monitor *mon, const QDict *q= dict) hmp_handle_error(mon, &local_err); } =20 +void hmp_chardev_send_break(Monitor *mon, const QDict *qdict) +{ + Error *local_err =3D NULL; + + qmp_chardev_send_break(qdict_get_str(qdict, "id"), &local_err); + hmp_handle_error(mon, &local_err); +} + void hmp_qemu_io(Monitor *mon, const QDict *qdict) { BlockBackend *blk; diff --git a/hmp.h b/hmp.h index d8b94ce9dc..214b2617e7 100644 --- a/hmp.h +++ b/hmp.h @@ -103,6 +103,7 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdic= t); void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); void hmp_chardev_add(Monitor *mon, const QDict *qdict); void hmp_chardev_remove(Monitor *mon, const QDict *qdict); +void hmp_chardev_send_break(Monitor *mon, const QDict *qdict); void hmp_qemu_io(Monitor *mon, const QDict *qdict); void hmp_cpu_add(Monitor *mon, const QDict *qdict); void hmp_object_add(Monitor *mon, const QDict *qdict); diff --git a/qapi-schema.json b/qapi-schema.json index 4b50b652d3..e01dd83dd9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5114,6 +5114,26 @@ { 'command': 'chardev-remove', 'data': {'id': 'str'} } =20 ## +# @chardev-send-break: +# +# Send a break to a character device +# +# @id: the chardev's ID, must exist +# +# Returns: Nothing on success +# +# Since: 2.10 +# +# Example: +# +# -> { "execute": "chardev-send-break", "arguments": { "id" : "foo" } } +# <- { "return": {} } +# +## +{ 'command': 'chardev-send-break', 'data': {'id': 'str'} } + + +## # @TpmModel: # # An enumeration of TPM models diff --git a/tests/test-char.c b/tests/test-char.c index dfe856cb85..c7f7ec1798 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -53,7 +53,9 @@ static void fe_event(void *opaque, int event) FeHandler *h =3D opaque; =20 h->last_event =3D event; - quit =3D true; + if (event !=3D CHR_EVENT_BREAK) { + quit =3D true; + } } =20 #ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS @@ -491,7 +493,7 @@ static void char_file_test(void) =20 file.in =3D fifo; file.has_in =3D true; - chr =3D qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, + chr =3D qemu_chardev_new("label-file", TYPE_CHARDEV_FILE, &backend, &error_abort); =20 qemu_chr_fe_init(&be, chr, &error_abort); @@ -501,6 +503,12 @@ static void char_file_test(void) fe_event, &fe, NULL, true); =20 + g_assert_cmpint(fe.last_event, !=3D, CHR_EVENT_BREAK); + qmp_chardev_send_break("label-foo", NULL); + g_assert_cmpint(fe.last_event, !=3D, CHR_EVENT_BREAK); + qmp_chardev_send_break("label-file", NULL); + g_assert_cmpint(fe.last_event, =3D=3D, CHR_EVENT_BREAK); + main_loop(); =20 close(fd); diff --git a/tests/test-hmp.c b/tests/test-hmp.c index 99e35ec15a..6dfa0c36e2 100644 --- a/tests/test-hmp.c +++ b/tests/test-hmp.c @@ -22,6 +22,7 @@ static int verbose; static const char *hmp_cmds[] =3D { "boot_set ndc", "chardev-add null,id=3Dtestchardev1", + "chardev-send-break testchardev2", "chardev-remove testchardev1", "commit all", "cpu-add 1", --=20 2.11.0