[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/20] chardev: switch parallel init to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/20] chardev: switch parallel init to qapi |
Date: |
Thu, 14 Mar 2013 09:57:30 +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 3033c2d..d8ac86b 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3145,22 +3145,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)
{
@@ -3196,6 +3180,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 (device == NULL) {
+ error_setg(errp, "chardev: parallel: no device path given");
+ return;
+ }
+ backend->parallel = g_new0(ChardevHostdev, 1);
+ backend->parallel->device = g_strdup(device);
+}
+
typedef struct CharDriver {
const char *name;
/* old, pre qapi */
@@ -3775,6 +3772,10 @@ static void register_types(void)
qemu_chr_parse_serial);
register_char_driver_qapi("tty", CHARDEV_BACKEND_KIND_SERIAL,
qemu_chr_parse_serial);
+ register_char_driver_qapi("parallel", CHARDEV_BACKEND_KIND_PARALLEL,
+ qemu_chr_parse_parallel);
+ register_char_driver_qapi("parport", CHARDEV_BACKEND_KIND_PARALLEL,
+ qemu_chr_parse_parallel);
#ifdef _WIN32
register_char_driver("pipe", qemu_chr_open_win_pipe);
register_char_driver("console", qemu_chr_open_win_con);
@@ -3784,10 +3785,6 @@ static void register_types(void)
#ifdef HAVE_CHARDEV_TTY
register_char_driver("pty", qemu_chr_open_pty);
#endif
-#ifdef HAVE_CHARDEV_PARPORT
- register_char_driver("parallel", qemu_chr_open_pp);
- register_char_driver("parport", qemu_chr_open_pp);
-#endif
}
type_init(register_types);
--
1.7.9.7
- [Qemu-devel] [PULL v4 00/20] chardev: qapi conversion continued, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 01/20] chardev: add support for qapi-based chardev initialization, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 02/20] chardev: add mux chardev support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 04/20] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 11/20] chardev: add console support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 08/20] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 19/20] spice-qemu-char: Fix name parameter issues after qapi-ifying, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 09/20] chardev: switch parallel init to qapi,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 03/20] chardev: switch null init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 15/20] chardev: add memory (ringbuf) support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 12/20] chardev: add pipe support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 10/20] chardev: switch pty init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 06/20] chardev: switch file init to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 14/20] chardev: add vc support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 07/20] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 17/20] Revert "hmp: Disable chardev-add and chardev-remove", Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 05/20] chardev: add braille support to qapi, Gerd Hoffmann, 2013/03/14
- [Qemu-devel] [PATCH 18/20] qemu-char.c: fix waiting for telnet connection message, Gerd Hoffmann, 2013/03/14