Patchwork [8/9] chardev: switch serial/tty init to qapi

login
register
mail settings
Submitter Gerd Hoffmann
Date Feb. 25, 2013, 9:03 a.m.
Message ID <1361783023-10082-11-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/222887/
State New
Headers show

Comments

Gerd Hoffmann - Feb. 25, 2013, 9:03 a.m.
This patch switches over the serial chardev initialization
to the new qapi code path.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qemu-char.c |   37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 4fdf381..eac4460 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1230,18 +1230,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 = qemu_open(filename, O_RDWR | O_NONBLOCK));
-    if (fd < 0) {
-        return NULL;
-    }
-    return qemu_chr_open_tty_fd(fd);
-}
 #endif /* __linux__ || __sun__ */
 
 #if defined(__linux__)
@@ -1668,11 +1656,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;
@@ -2970,6 +2953,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 (path == NULL) {
+        error_setg(errp, "chardev: serial/tty: no device path given");
+        return;
+    }
+    backend->serial = g_new0(ChardevHostdev, 1);
+    backend->serial->device = g_strdup(device);
+}
+
 static const struct {
     const char *name;
     /* old, pre qapi */
@@ -2988,10 +2984,13 @@  static const struct {
                            .parse = qemu_chr_parse_file_out },
     { .name = "stdio",     .kind  = CHARDEV_BACKEND_KIND_STDIO,
                            .parse = qemu_chr_parse_stdio },
+    { .name = "serial",    .kind  = CHARDEV_BACKEND_KIND_SERIAL,
+                           .parse = qemu_chr_parse_serial },
+    { .name = "tty",       .kind  = CHARDEV_BACKEND_KIND_SERIAL,
+                           .parse = qemu_chr_parse_serial },
 #ifdef _WIN32
     { .name = "pipe",      .open = qemu_chr_open_win_pipe },
     { .name = "console",   .open = qemu_chr_open_win_con },
-    { .name = "serial",    .open = qemu_chr_open_win },
 #else
     { .name = "pipe",      .open = qemu_chr_open_pipe },
 #endif
@@ -2999,8 +2998,6 @@  static const struct {
     { .name = "braille",   .kind  = CHARDEV_BACKEND_KIND_BRAILLE },
 #endif
 #ifdef HAVE_CHARDEV_TTY
-    { .name = "tty",       .open = qemu_chr_open_tty },
-    { .name = "serial",    .open = qemu_chr_open_tty },
     { .name = "pty",       .open = qemu_chr_open_pty },
 #endif
 #ifdef HAVE_CHARDEV_PARPORT