[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] chardev: add parport chardev support to chard
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/11] chardev: add parport chardev support to chardev-add (qmp) |
Date: |
Mon, 7 Jan 2013 14:55:26 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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' ] }
{ '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;
--
1.7.1
- [Qemu-devel] [PATCH 00/11] chardev hotplug patch series, Gerd Hoffmann, 2013/01/07
- [Qemu-devel] [PATCH 02/11] chardev: fix QemuOpts lifecycle, Gerd Hoffmann, 2013/01/07
- [Qemu-devel] [PATCH 04/11] chardev: add qmp hotplug commands, with null chardev support, Gerd Hoffmann, 2013/01/07
- [Qemu-devel] [PATCH 01/11] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2013/01/07
- [Qemu-devel] [PATCH 09/11] chardev: add parport chardev support to chardev-add (qmp),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/11] chardev: add serial chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/07
[Qemu-devel] [PATCH 05/11] chardev: add hmp hotplug commands, Gerd Hoffmann, 2013/01/07