[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] chardev: hotplug, qmp, parallel
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 9/9] chardev: hotplug, qmp, parallel |
Date: |
Wed, 19 Dec 2012 16:59:07 +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 9f23c25..5dedacc 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1357,17 +1357,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);
@@ -1431,16 +1424,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;
@@ -2740,6 +2726,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);
@@ -3039,6 +3041,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 RfC 0/9] chardev hotplug, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 2/9] chardev: fix QemuOpts lifecycle, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 9/9] chardev: hotplug, qmp, parallel,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 6/9] chardev: hotplug, qmp, file, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 7/9] chardev: hotplug, qmp, tty, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 4/9] chardev: hotplug, qmp, null, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 1/9] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 3/9] chardev: reduce chardev ifdef mess a bit, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 5/9] chardev: hotplug, hmp, Gerd Hoffmann, 2012/12/19