[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/49] qemu-char: convert pty backend to data-driven
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 32/49] qemu-char: convert pty backend to data-driven creation |
Date: |
Fri, 16 Oct 2015 10:49:54 +0200 |
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 4f9bd14..9adf2cc 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1390,7 +1390,9 @@ static void pty_chr_close(struct CharDriverState *chr)
}
static CharDriverState *qemu_chr_open_pty(const char *id,
- ChardevReturn *ret)
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
CharDriverState *chr;
PtyCharDriver *s;
@@ -1399,6 +1401,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
master_fd = qemu_openpty_raw(&slave_fd, pty_name);
if (master_fd < 0) {
+ error_setg_errno(errp, errno, "Failed to create PTY");
return NULL;
}
@@ -4296,11 +4299,9 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_UDP:
abort();
break;
-#ifdef HAVE_CHARDEV_PTY
case CHARDEV_BACKEND_KIND_PTY:
- chr = qemu_chr_open_pty(id, ret);
+ abort();
break;
-#endif
case CHARDEV_BACKEND_KIND_NULL:
chr = qemu_chr_open_null();
break;
@@ -4428,8 +4429,10 @@ static void register_types(void)
register_char_driver("parport", CHARDEV_BACKEND_KIND_PARALLEL,
qemu_chr_parse_parallel, qmp_chardev_open_parallel);
#endif
+#ifdef HAVE_CHARDEV_PTY
register_char_driver("pty", CHARDEV_BACKEND_KIND_PTY, NULL,
- NULL);
+ qemu_chr_open_pty);
+#endif
register_char_driver("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL,
NULL);
register_char_driver("pipe", CHARDEV_BACKEND_KIND_PIPE,
--
2.5.0
- [Qemu-devel] [PULL 21/49] qemu-sockets: fix conversion of ipv4/ipv6 JSON to QemuOpts, (continued)
- [Qemu-devel] [PULL 21/49] qemu-sockets: fix conversion of ipv4/ipv6 JSON to QemuOpts, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 20/49] MAINTAINERS: Add more devices to realview board, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 26/49] qemu-char: convert file backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 25/49] qemu-char: add create to register_char_driver, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 23/49] qemu-char: cleanup qmp_chardev_add, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 24/49] qemu-char: cleanup HAVE_CHARDEV_*, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 22/49] README: fill out some useful quickstart information, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 29/49] qemu-char: convert pipe backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 30/49] qemu-char: convert socket backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 28/49] qemu-char: convert parallel backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 32/49] qemu-char: convert pty backend to data-driven creation,
Paolo Bonzini <=
- [Qemu-devel] [PULL 27/49] qemu-char: convert serial backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 31/49] qemu-char: convert UDP backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 35/49] qemu-char: convert msmouse backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 37/49] qemu-char: convert testdev backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 33/49] qemu-char: convert null backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 34/49] qemu-char: convert mux backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 43/49] qemu-char: cleanup after completed conversion to cd->create, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 40/49] qemu-char: convert spice backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 41/49] qemu-char: convert vc backend to data-driven creation, Paolo Bonzini, 2015/10/16