[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] chardev: switch parallel init to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 9/9] chardev: switch parallel init to qapi |
Date: |
Mon, 25 Feb 2013 10:03:43 +0100 |
This patch switches over the parallel chardev initialization
to the new qapi code path.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-char.c | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
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
--
1.7.9.7
- Re: [Qemu-devel] [PATCH 1/9] chardev: add support for qapi-based chardev initialization, (continued)
- [Qemu-devel] [PATCH 1/2] require gtk 2.20+, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 3/9] chardev: switch null init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 8/9] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 5/9] chardev: add braille support to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 7/9] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 6/9] chardev: switch file init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 4/9] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 9/9] chardev: switch parallel init to qapi,
Gerd Hoffmann <=
- [Qemu-devel] SocketAdress + udb, Gerd Hoffmann, 2013/02/26