From 115ee357b307e4c0b156994ad429b31ae71ad752 Mon Sep 17 00:00:00 2001 Message-Id: <115ee357b307e4c0b156994ad429b31ae71ad752.1374754302.git.minovotn@redhat.com> In-Reply-To: <5d75a8513d08b33975bdf5971871c0c977167cd1.1374754301.git.minovotn@redhat.com> References: <5d75a8513d08b33975bdf5971871c0c977167cd1.1374754301.git.minovotn@redhat.com> From: Gerd Hoffmann Date: Mon, 24 Jun 2013 07:06:05 +0200 Subject: [PATCH 54/65] chardev: switch serial/tty init to qapi RH-Author: Gerd Hoffmann Message-id: <1372057576-26450-55-git-send-email-kraxel@redhat.com> Patchwork-id: 52135 O-Subject: [RHEL-6.5 qemu-kvm PATCH v2 54/65] chardev: switch serial/tty init to qapi Bugzilla: 676568 RH-Acked-by: Laszlo Ersek RH-Acked-by: Hans de Goede RH-Acked-by: Luiz Capitulino This patch switches over the serial chardev initialization to the new qapi code path. Signed-off-by: Gerd Hoffmann (cherry picked from commit 0f1cb51da7112fa62c6cde62f546714a2c672f54) Conflicts: qemu-char.c --- qemu-char.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) Signed-off-by: Michal Novotny --- qemu-char.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 4076cd3..a5cbd70 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1434,18 +1434,6 @@ static CharDriverState *qemu_chr_open_tty_fd(int fd) chr->chr_close = qemu_chr_close_tty; return chr; } - -static CharDriverState *qemu_chr_open_tty(QemuOpts *opts) -{ - const char *filename = qemu_opt_get(opts, "path"); - int fd; - - TFR(fd = open(filename, O_RDWR | O_NONBLOCK)); - if (fd < 0) { - return NULL; - } - return qemu_chr_open_tty_fd(fd); -} #endif /* __linux__ || __sun__ */ #if defined(__linux__) @@ -1862,11 +1850,6 @@ static CharDriverState *qemu_chr_open_win_path(const char *filename) return chr; } -static CharDriverState *qemu_chr_open_win(QemuOpts *opts) -{ - return qemu_chr_open_win_path(qemu_opt_get(opts, "path")); -} - static int win_chr_pipe_poll(void *opaque) { CharDriverState *chr = opaque; @@ -2809,6 +2792,19 @@ static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend, qemu_opt_get_bool(opts, "signal", display_type != DT_NOGRAPHIC); } +static void qemu_chr_parse_serial(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + const char *device = qemu_opt_get(opts, "path"); + + if (device == NULL) { + error_setg(errp, "chardev: serial/tty: no device path given"); + return; + } + backend->serial = g_new0(ChardevHostdev, 1); + backend->serial->device = g_strdup(device); +} + typedef struct CharDriver { const char *name; /* old, pre qapi */ @@ -3317,16 +3313,17 @@ static void register_types(void) qemu_chr_parse_file_out); register_char_driver_qapi("stdio", CHARDEV_BACKEND_KIND_STDIO, qemu_chr_parse_stdio); + register_char_driver_qapi("serial", CHARDEV_BACKEND_KIND_SERIAL, + qemu_chr_parse_serial); + register_char_driver_qapi("tty", CHARDEV_BACKEND_KIND_SERIAL, + qemu_chr_parse_serial); #ifdef _WIN32 register_char_driver("pipe", qemu_chr_open_win_pipe); register_char_driver("console", qemu_chr_open_win_con); - register_char_driver("serial", qemu_chr_open_win); #else register_char_driver("pipe", qemu_chr_open_pipe); #endif #ifdef HAVE_CHARDEV_TTY - register_char_driver("tty", qemu_chr_open_tty); - register_char_driver("serial", qemu_chr_open_tty); register_char_driver("pty", qemu_chr_open_pty); #endif #ifdef HAVE_CHARDEV_PARPORT -- 1.7.11.7