From patchwork Mon Oct 15 08:06:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 191484 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 56AB32C00A3 for ; Mon, 15 Oct 2012 19:08:16 +1100 (EST) Received: from localhost ([::1]:52453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNfif-0003qK-RZ for incoming@patchwork.ozlabs.org; Mon, 15 Oct 2012 04:08:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNfhb-0001RQ-H1 for qemu-devel@nongnu.org; Mon, 15 Oct 2012 04:07:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNfhW-0005u9-Ny for qemu-devel@nongnu.org; Mon, 15 Oct 2012 04:07:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNfhW-0005to-FC for qemu-devel@nongnu.org; Mon, 15 Oct 2012 04:07:02 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9F871rx017179 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Oct 2012 04:07:02 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9F870bw006162; Mon, 15 Oct 2012 04:07:01 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id BC2FD4199A; Mon, 15 Oct 2012 10:06:58 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2012 10:06:57 +0200 Message-Id: <1350288417-24350-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1350288417-24350-1-git-send-email-kraxel@redhat.com> References: <1350288417-24350-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v3 9/9] chardev: add hotplug support. 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 This patch adds chardev_add and chardev_del monitor commands. They work simliar to the netdev_{add,del} commands. The hmp version of chardev_add accepts like the -chardev command line option does. The qmp version expects the arguments being passed as named parameters. chardev_del just takes an id argument and zaps the chardev specified. Signed-off-by: Gerd Hoffmann --- hmp-commands.hx | 32 ++++++++++++++++++++++++++++ hmp.c | 23 ++++++++++++++++++++ hmp.h | 2 + qapi-schema.json | 39 ++++++++++++++++++++++++++++++++++ qemu-char.c | 44 ++++++++++++++++++++++++++++++++++++++ qemu-char.h | 1 + qmp-commands.hx | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 202 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e0b537d..48504d1 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1404,6 +1404,38 @@ passed since 1970, i.e. unix epoch. ETEXI { + .name = "chardev_add", + .args_type = "args:s", + .params = "args", + .help = "add chardev", + .mhandler.cmd = hmp_chardev_add, + }, + +STEXI +@item chardev_add args +@findex chardev_add + +chardev_add accepts the same parameters as the -chardev command line switch. + +ETEXI + + { + .name = "chardev_del", + .args_type = "id:s", + .params = "id", + .help = "del chardev", + .mhandler.cmd = hmp_chardev_del, + }, + +STEXI +@item chardev_del id +@findex chardev_del + +Removes the chardev @var{id}. + +ETEXI + + { .name = "info", .args_type = "item:s?", .params = "[subcommand]", diff --git a/hmp.c b/hmp.c index 70bdec2..96bb900 100644 --- a/hmp.c +++ b/hmp.c @@ -1209,3 +1209,26 @@ void hmp_screen_dump(Monitor *mon, const QDict *qdict) qmp_screendump(filename, &err); hmp_handle_error(mon, &err); } + +void hmp_chardev_add(Monitor *mon, const QDict *qdict) +{ + const char *args = qdict_get_str(qdict, "args"); + Error *err = NULL; + QemuOpts *opts; + + opts = qemu_opts_parse(qemu_find_opts("chardev"), args, 1); + if (opts == NULL) { + error_setg(&err, "Parsing chardev args failed\n"); + } else { + qemu_chr_new_from_opts(opts, NULL, &err); + } + hmp_handle_error(mon, &err); +} + +void hmp_chardev_del(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + qmp_chardev_del(qdict_get_str(qdict, "id"), + &err); + hmp_handle_error(mon, &err); +} diff --git a/hmp.h b/hmp.h index 71ea384..080afaa 100644 --- a/hmp.h +++ b/hmp.h @@ -75,5 +75,7 @@ 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_chardev_add(Monitor *mon, const QDict *qdict); +void hmp_chardev_del(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index f9dbdae..550e4c7 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2796,3 +2796,42 @@ # Since: 0.14.0 ## { 'command': 'screendump', 'data': {'filename': 'str'} } + +## +# @chardev_add: +# +# Add a chardev +# +# @id: the chardev's ID, must be unique +# @backend: the chardev backend: "file", "socket", ... +# @path: file / device / unix socket path +# @name: spice channel name +# @host: host name +# @port: port number +# @server: create socket in server mode +# @wait: wait for connect +# @ipv4: force ipv4-only +# @ipv6: force ipv6-only +# @telnet: telnet negotiation +# +# Returns: Nothing on success +# +# Since: 1.3.0 +## +{ 'command': 'chardev_add', 'data': {'id' : 'str', + 'backend' : 'str', + '*props' : '**' }, + 'gen': 'no' } + +## +# @chardev_del: +# +# Remove a chardev +# +# @id: the chardev's ID, must exist and not be in use +# +# Returns: Nothing on success +# +# Since: 1.3.0 +## +{ 'command': 'chardev_del', 'data': {'id': 'str'} } diff --git a/qemu-char.c b/qemu-char.c index be4ec61..dae3e3c 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2911,3 +2911,47 @@ CharDriverState *qemu_char_get_next_serial(void) return serial_hds[next_serial++]; } +int qmp_chardev_add(Monitor *mon, const QDict *qdict, QObject **ret) +{ + Error *err = NULL; + QemuOptsList *opts_list; + QemuOpts *opts; + + opts_list = qemu_find_opts_err("chardev", &err); + if (error_is_set(&err)) { + goto exit_err; + } + + opts = qemu_opts_from_qdict(opts_list, qdict, &err); + if (error_is_set(&err)) { + goto exit_err; + } + + qemu_chr_new_from_opts(opts, NULL, &err); + if (error_is_set(&err)) { + goto exit_err; + } + return 0; + +exit_err: + qerror_report_err(err); + error_free(err); + return -1; +} + +void qmp_chardev_del(const char *id, Error **errp) +{ + CharDriverState *chr; + + chr = qemu_chr_find(id); + if (NULL == chr) { + error_setg(errp, "Chardev '%s' not found\n", id); + return; + } + if (chr->chr_can_read || chr->chr_read || + chr->chr_event || chr->handler_opaque) { + error_setg(errp, "Chardev '%s' is busy\n", id); + return; + } + qemu_chr_delete(chr); +} diff --git a/qemu-char.h b/qemu-char.h index 99bc132..407e0fe 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -238,6 +238,7 @@ void qemu_chr_info(Monitor *mon, QObject **ret_data); CharDriverState *qemu_chr_find(const char *name); QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename); +int qmp_chardev_add(Monitor *mon, const QDict *qdict, QObject **ret); /* add an eventfd to the qemu devices that are polled */ CharDriverState *qemu_chr_open_eventfd(int eventfd); diff --git a/qmp-commands.hx b/qmp-commands.hx index 2f8477e..ebc1cee 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2576,3 +2576,64 @@ EQMP .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_target, }, + + { + .name = "chardev_add", + .args_type = "", + .mhandler.cmd_new = qmp_chardev_add, + }, + +SQMP +chardev_add +----------- + +Add a chardev. + +Arguments: + +- "id": the chardev's ID, must be unique (json-string) +- "backend": the chardev backend: "file", "socket", ... (json-string) +- "path": file / device / unix socket path (json-string, optional) +- "name": spice channel name (json-string, optional) +- "host": host name (json-string, optional) +- "port": port number (json-string, optional) +- "server": create socket in server mode (json-bool, optional) +- "wait": wait for connect (json-bool, optional) +- "ipv4": force ipv4-only (json-bool, optional) +- "ipv6": force ipv6-only (json-bool, optional) +- "telnet": telnet negotiation (json-bool, optional) + +Example: + +-> { "execute": "chardev_add", "arguments": { "id" : "foo", + "backend" : "socket", + "path" : "/tmp/foo", + "server" : "on", + "wait" : "off" } } +<- { "return": {} } + +EQMP + + { + .name = "chardev_del", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_chardev_del, + }, + + +SQMP +chardev_del +----------- + +Remove a chardev. + +Arguments: + +- "id": the chardev's ID, must exist and not be in use (json-string) + +Example: + +-> { "execute": "chardev_del", "arguments": { "id" : "foo" } } +<- { "return": {} } + +EQMP