diff mbox

[v2,10/10] chardev: add pty chardev support to chardev-add (qmp)

Message ID 1357827786-14624-11-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann Jan. 10, 2013, 2:23 p.m. UTC 
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>
---
 qapi-schema.json |    3 ++-
 qemu-char.c      |   13 +++++++++++++
 qmp-commands.hx  |    5 +++++
 3 files changed, 20 insertions(+), 1 deletions(-)

Comments

Eric Blake Jan. 10, 2013, 7:45 p.m. UTC | #1 
On 01/10/2013 07:23 AM, Gerd Hoffmann wrote:
> 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>
> ---
>  qapi-schema.json |    3 ++-
>  qemu-char.c      |   13 +++++++++++++
>  qmp-commands.hx  |    5 +++++
>  3 files changed, 20 insertions(+), 1 deletions(-)

> +++ 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" } }

I like it.  The QMP API is looking saner now, although I still pointed
out enough questions that you might need a v3.
diff mbox

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index a654096..23b6862 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3066,6 +3066,7 @@ 
 { 'union': 'ChardevBackend', 'data': { 'file'   : 'ChardevFile',
                                        'port'   : 'ChardevPort',
                                        'socket' : 'ChardevSocket',
+                                       'pty'    : 'ChardevDummy',
                                        'null'   : 'ChardevDummy' } }
 
 ##
@@ -3075,7 +3076,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 eb6b153..530d582 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3124,6 +3124,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
 
     {