[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] chardev: add pty chardev support to chardev-a
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/10] chardev: add pty chardev support to chardev-add (qmp) |
Date: |
Wed, 16 Jan 2013 11:21:13 +0100 |
The ptsname is returned directly, so there is no need to
use query-chardev to figure the pty device path.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qapi-schema.json | 3 ++-
qemu-char.c | 13 +++++++++++++
qmp-commands.hx | 5 +++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 5c3e3eb..6d7252b 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3081,6 +3081,7 @@
{ 'union': 'ChardevBackend', 'data': { 'file' : 'ChardevFile',
'port' : 'ChardevPort',
'socket' : 'ChardevSocket',
+ 'pty' : 'ChardevDummy',
'null' : 'ChardevDummy' } }
##
@@ -3090,7 +3091,7 @@
#
# Since: 1.4
##
-{ 'type' : 'ChardevReturn', 'data': { } }
+{ 'type' : 'ChardevReturn', 'data': { '*pty' : 'str' } }
##
# @chardev-add:
diff --git a/qemu-char.c b/qemu-char.c
index 36d7e29..9ba0573 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3204,6 +3204,19 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_SOCKET:
chr = qmp_chardev_open_socket(backend->socket, errp);
break;
+#ifdef HAVE_CHARDEV_TTY
+ case CHARDEV_BACKEND_KIND_PTY:
+ {
+ /* qemu_chr_open_pty sets "path" in opts */
+ QemuOpts *opts;
+ opts = qemu_opts_create_nofail(qemu_find_opts("chardev"));
+ chr = qemu_chr_open_pty(opts);
+ ret->pty = g_strdup(qemu_opt_get(opts, "path"));
+ ret->has_pty = true;
+ qemu_opts_del(opts);
+ break;
+ }
+#endif
case CHARDEV_BACKEND_KIND_NULL:
chr = qemu_chr_open_null(NULL);
break;
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 4d382f4..cbf1280 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2685,6 +2685,11 @@ Examples:
"data" : { "out" : "/tmp/bar.log" } } } }
<- { "return": {} }
+-> { "execute" : "chardev-add",
+ "arguments" : { "id" : "baz",
+ "backend" : { "type" : "pty", "data" : {} } } }
+<- { "return": { "pty" : "/dev/pty/42" } }
+
EQMP
{
--
1.7.9.7
- [Qemu-devel] [PULL 00/10] chardev hotplug support, Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 02/10] chardev: fix QemuOpts lifecycle, Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 03/10] chardev: reduce chardev ifdef mess a bit, Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 04/10] chardev: add qmp hotplug commands, with null chardev support, Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 08/10] chardev: add parallel chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 06/10] chardev: add file chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 09/10] chardev: add socket chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 10/10] chardev: add pty chardev support to chardev-add (qmp),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 01/10] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 07/10] chardev: add serial chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/16
- [Qemu-devel] [PATCH 05/10] chardev: add hmp hotplug commands, Gerd Hoffmann, 2013/01/16
- Re: [Qemu-devel] [PULL 00/10] chardev hotplug support, Eric Blake, 2013/01/16
- Re: [Qemu-devel] [PULL 00/10] chardev hotplug support, Anthony Liguori, 2013/01/16