Patchwork [09/11] chardev: add parport chardev support to chardev-add (qmp)

login
register
mail settings
Submitter Gerd Hoffmann
Date Jan. 7, 2013, 1:55 p.m.
Message ID <1357566928-25361-10-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/209935/
State New
Headers show

Comments

Gerd Hoffmann - Jan. 7, 2013, 1:55 p.m.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qapi-schema.json |    3 ++-
 qemu-char.c      |   43 +++++++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 17 deletions(-)
Paolo Bonzini - Jan. 10, 2013, 10:40 a.m.
Il 07/01/2013 14:55, Gerd Hoffmann ha scritto:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  qapi-schema.json |    3 ++-
>  qemu-char.c      |   43 +++++++++++++++++++++++++++----------------
>  2 files changed, 29 insertions(+), 17 deletions(-)
> 
> diff --git a/qapi-schema.json b/qapi-schema.json
> index d833385..0922823 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -3037,7 +3037,8 @@
>                                     'out' : 'ChardevFileSource' } }
>  
>  { 'enum': 'ChardevPortKind', 'data': [ 'tty',
> -                                       'serial' ] }
> +                                       'serial',
> +                                       'parport' ] }

I'd say either ['tty', 'parport'] or ['serial', 'parallel'].  In the
latter case, parallel could be an alias of parport also in the QemuOpts
case.

Apart from this,

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

>  
>  { 'type': 'ChardevPort', 'data': { 'device' : 'ChardevFileSource',
>                                     'type'   : 'ChardevPortKind'} }
> diff --git a/qemu-char.c b/qemu-char.c
> index 4232fea..5cbf44e 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -1367,17 +1367,10 @@ static void pp_close(CharDriverState *chr)
>      qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
>  }
>  
> -static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
> +static CharDriverState *qemu_chr_open_pp_fd(int fd)
>  {
> -    const char *filename = qemu_opt_get(opts, "path");
>      CharDriverState *chr;
>      ParallelCharDriver *drv;
> -    int fd;
> -
> -    TFR(fd = qemu_open(filename, O_RDWR));
> -    if (fd < 0) {
> -        return NULL;
> -    }
>  
>      if (ioctl(fd, PPCLAIM) < 0) {
>          close(fd);
> @@ -1441,16 +1434,9 @@ static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
>      return 0;
>  }
>  
> -static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
> +static CharDriverState *qemu_chr_open_pp_fd(int fd)
>  {
> -    const char *filename = qemu_opt_get(opts, "path");
>      CharDriverState *chr;
> -    int fd;
> -
> -    fd = qemu_open(filename, O_RDWR);
> -    if (fd < 0) {
> -        return NULL;
> -    }
>  
>      chr = g_malloc0(sizeof(CharDriverState));
>      chr->opaque = (void *)(intptr_t)fd;
> @@ -2750,6 +2736,22 @@ 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 const struct {
>      const char *name;
>      CharDriverState *(*open)(QemuOpts *opts);
> @@ -3053,6 +3055,15 @@ static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp)
>          }
>          return qemu_chr_open_tty_fd(fd);
>  #endif
> +#ifdef HAVE_CHARDEV_PARPORT
> +    case CHARDEV_PORT_KIND_PARPORT:
> +        flags = O_RDWR;
> +        fd = qmp_chardev_open_file_source(port->device, flags, errp);
> +        if (error_is_set(errp)) {
> +            return NULL;
> +        }
> +        return qemu_chr_open_pp_fd(fd);
> +#endif
>      default:
>          error_setg(errp, "unknown chardev port (%d)", port->type);
>          return NULL;
>

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index d833385..0922823 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3037,7 +3037,8 @@ 
                                    'out' : 'ChardevFileSource' } }
 
 { 'enum': 'ChardevPortKind', 'data': [ 'tty',
-                                       'serial' ] }
+                                       'serial',
+                                       'parport' ] }
 
 { 'type': 'ChardevPort', 'data': { 'device' : 'ChardevFileSource',
                                    'type'   : 'ChardevPortKind'} }
diff --git a/qemu-char.c b/qemu-char.c
index 4232fea..5cbf44e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1367,17 +1367,10 @@  static void pp_close(CharDriverState *chr)
     qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
 }
 
-static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_pp_fd(int fd)
 {
-    const char *filename = qemu_opt_get(opts, "path");
     CharDriverState *chr;
     ParallelCharDriver *drv;
-    int fd;
-
-    TFR(fd = qemu_open(filename, O_RDWR));
-    if (fd < 0) {
-        return NULL;
-    }
 
     if (ioctl(fd, PPCLAIM) < 0) {
         close(fd);
@@ -1441,16 +1434,9 @@  static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
     return 0;
 }
 
-static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_pp_fd(int fd)
 {
-    const char *filename = qemu_opt_get(opts, "path");
     CharDriverState *chr;
-    int fd;
-
-    fd = qemu_open(filename, O_RDWR);
-    if (fd < 0) {
-        return NULL;
-    }
 
     chr = g_malloc0(sizeof(CharDriverState));
     chr->opaque = (void *)(intptr_t)fd;
@@ -2750,6 +2736,22 @@  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 const struct {
     const char *name;
     CharDriverState *(*open)(QemuOpts *opts);
@@ -3053,6 +3055,15 @@  static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp)
         }
         return qemu_chr_open_tty_fd(fd);
 #endif
+#ifdef HAVE_CHARDEV_PARPORT
+    case CHARDEV_PORT_KIND_PARPORT:
+        flags = O_RDWR;
+        fd = qmp_chardev_open_file_source(port->device, flags, errp);
+        if (error_is_set(errp)) {
+            return NULL;
+        }
+        return qemu_chr_open_pp_fd(fd);
+#endif
     default:
         error_setg(errp, "unknown chardev port (%d)", port->type);
         return NULL;