diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-12-20 14:39:13 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-01-16 06:58:54 +0100 |
| commit | 0a1a7fabda7f0fa05ef09051be29e92e81f929ad (patch) | |
| tree | 25ec7df376c7f5b8a451c13be426f17e7d30efb8 | |
| parent | f6bd5d6ec514939c421fcd411d1a39bc7dad0948 (diff) | |
| download | focaccia-qemu-0a1a7fabda7f0fa05ef09051be29e92e81f929ad.tar.gz focaccia-qemu-0a1a7fabda7f0fa05ef09051be29e92e81f929ad.zip | |
chardev: add pty chardev support to chardev-add (qmp)
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 <kraxel@redhat.com>
| -rw-r--r-- | qapi-schema.json | 3 | ||||
| -rw-r--r-- | qemu-char.c | 13 | ||||
| -rw-r--r-- | qmp-commands.hx | 5 |
3 files changed, 20 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 5c3e3eb469..6d7252b9e8 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 36d7e29953..9ba0573c6a 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 4d382f4ffc..cbf12804be 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 { |