[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/20] chardev: switch pty init to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/20] chardev: switch pty init to qapi |
Date: |
Thu, 14 Mar 2013 09:57:31 +0100 |
This patch switches over the pty chardev initialization
to the new qapi code path.
Bonus: Taking QemuOpts out of the loop allows some nice
cleanups along the way.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-char.c | 35 ++++++++++-------------------------
1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index d8ac86b..158b81e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1157,13 +1157,13 @@ static void pty_chr_close(struct CharDriverState *chr)
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
}
-static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_pty(const char *id,
+ ChardevReturn *ret)
{
CharDriverState *chr;
PtyCharDriver *s;
struct termios tty;
- const char *label;
- int master_fd, slave_fd, len;
+ int master_fd, slave_fd;
#if defined(__OpenBSD__) || defined(__DragonFly__)
char pty_name[PATH_MAX];
#define q_ptsname(x) pty_name
@@ -1184,17 +1184,12 @@ static CharDriverState *qemu_chr_open_pty(QemuOpts
*opts)
chr = g_malloc0(sizeof(CharDriverState));
- len = strlen(q_ptsname(master_fd)) + 5;
- chr->filename = g_malloc(len);
- snprintf(chr->filename, len, "pty:%s", q_ptsname(master_fd));
- qemu_opt_set(opts, "path", q_ptsname(master_fd));
+ chr->filename = g_strdup_printf("pty:%s", q_ptsname(master_fd));
+ ret->pty = g_strdup(q_ptsname(master_fd));
+ ret->has_pty = true;
- label = qemu_opts_id(opts);
- fprintf(stderr, "char device redirected to %s%s%s%s\n",
- q_ptsname(master_fd),
- label ? " (label " : "",
- label ? label : "",
- label ? ")" : "");
+ fprintf(stderr, "char device redirected to %s (label %s)\n",
+ q_ptsname(master_fd), id);
s = g_malloc0(sizeof(PtyCharDriver));
chr->opaque = s;
@@ -3687,16 +3682,8 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
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);
+ chr = qemu_chr_open_pty(id, ret);
break;
- }
#endif
case CHARDEV_BACKEND_KIND_NULL:
chr = qemu_chr_open_null();
@@ -3776,15 +3763,13 @@ static void register_types(void)
qemu_chr_parse_parallel);
register_char_driver_qapi("parport", CHARDEV_BACKEND_KIND_PARALLEL,
qemu_chr_parse_parallel);
+ register_char_driver_qapi("pty", CHARDEV_BACKEND_KIND_PTY, NULL);
#ifdef _WIN32
register_char_driver("pipe", qemu_chr_open_win_pipe);
register_char_driver("console", qemu_chr_open_win_con);
#else
register_char_driver("pipe", qemu_chr_open_pipe);
#endif
-#ifdef HAVE_CHARDEV_TTY
- register_char_driver("pty", qemu_chr_open_pty);
-#endif
}
type_init(register_types);
--
1.7.9.7
- [Qemu-devel] [PATCH 01/20] chardev: add support for qapi-based chardev initialization, (continued)
- [Qemu-devel] [PATCH 01/20] chardev: add support for qapi-based chardev initialization, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 02/20] chardev: add mux chardev support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 04/20] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 11/20] chardev: add console support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 08/20] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 19/20] spice-qemu-char: Fix name parameter issues after qapi-ifying, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 09/20] chardev: switch parallel init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 03/20] chardev: switch null init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 15/20] chardev: add memory (ringbuf) support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 12/20] chardev: add pipe support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 10/20] chardev: switch pty init to qapi,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 06/20] chardev: switch file init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 14/20] chardev: add vc support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 07/20] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 17/20] Revert "hmp: Disable chardev-add and chardev-remove", Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 05/20] chardev: add braille support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 18/20] qemu-char.c: fix waiting for telnet connection message, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 16/20] chardev: add udp support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 13/20] chardev: add spice support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 20/20] spice-qemu-char: Remove dead debugging code, Gerd Hoffmann, 2013/03/14
- Re: [Qemu-devel] [PULL v4 00/20] chardev: qapi conversion continued, Eric Blake, 2013/03/14