Patchwork [9/9] chardev: switch parallel init to qapi

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

Comments

Gerd Hoffmann - Feb. 25, 2013, 9:03 a.m.
This patch switches over the parallel 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 eac4460..c53607b 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2915,22 +2915,6 @@  fail:
     return NULL;
 }
 
-#ifdef HAVE_CHARDEV_PARPORT
-
-static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
-{
-    const char *filename = qemu_opt_get(opts, "path");
-    int fd;
-
-    fd = qemu_open(filename, O_RDWR);
-    if (fd < 0) {
-        return NULL;
-    }
-    return qemu_chr_open_pp_fd(fd);
-}
-
-#endif
-
 static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend,
                                     Error **errp)
 {
@@ -2966,6 +2950,19 @@  static void qemu_chr_parse_serial(QemuOpts *opts, ChardevBackend *backend,
     backend->serial->device = g_strdup(device);
 }
 
+static void qemu_chr_parse_parallel(QemuOpts *opts, ChardevBackend *backend,
+                                    Error **errp)
+{
+    const char *device = qemu_opt_get(opts, "path");
+
+    if (path == NULL) {
+        error_setg(errp, "chardev: parallel: no device path given");
+        return;
+    }
+    backend->parallel = g_new0(ChardevHostdev, 1);
+    backend->parallel->device = g_strdup(device);
+}
+
 static const struct {
     const char *name;
     /* old, pre qapi */
@@ -2988,6 +2985,10 @@  static const struct {
                            .parse = qemu_chr_parse_serial },
     { .name = "tty",       .kind  = CHARDEV_BACKEND_KIND_SERIAL,
                            .parse = qemu_chr_parse_serial },
+    { .name = "parallel",  .kind  = CHARDEV_BACKEND_KIND_PARALLEL,
+                           .parse = qemu_chr_parse_parallel },
+    { .name = "parport",   .kind  = CHARDEV_BACKEND_KIND_PARALLEL,
+                           .parse = qemu_chr_parse_parallel },
 #ifdef _WIN32
     { .name = "pipe",      .open = qemu_chr_open_win_pipe },
     { .name = "console",   .open = qemu_chr_open_win_con },
@@ -3000,10 +3001,6 @@  static const struct {
 #ifdef HAVE_CHARDEV_TTY
     { .name = "pty",       .open = qemu_chr_open_pty },
 #endif
-#ifdef HAVE_CHARDEV_PARPORT
-    { .name = "parallel",  .open = qemu_chr_open_pp },
-    { .name = "parport",   .open = qemu_chr_open_pp },
-#endif
 #ifdef CONFIG_SPICE
     { .name = "spicevmc",     .open = qemu_chr_open_spice },
 #if SPICE_SERVER_VERSION >= 0x000c02