[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/17] chardev: add pipe support to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 12/17] chardev: add pipe support to qapi |
Date: |
Thu, 28 Feb 2013 08:50:04 +0100 |
This patch adds 'pipe' support to qapi and also switches over the
pipe chardev initialization to the new qapi code path.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qapi-schema.json | 3 ++-
qemu-char.c | 31 ++++++++++++++++++++++---------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 94a3f02..c9e9bd5 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3153,7 +3153,7 @@
##
# @ChardevHostdev:
#
-# Configuration info for device chardevs.
+# Configuration info for device and pipe chardevs.
#
# @device: The name of the special file for the device,
# i.e. /dev/ttyS0 on Unix or COM1: on Windows
@@ -3220,6 +3220,7 @@
{ 'union': 'ChardevBackend', 'data': { 'file' : 'ChardevFile',
'serial' : 'ChardevHostdev',
'parallel': 'ChardevHostdev',
+ 'pipe' : 'ChardevHostdev',
'socket' : 'ChardevSocket',
'pty' : 'ChardevDummy',
'null' : 'ChardevDummy',
diff --git a/qemu-char.c b/qemu-char.c
index fe117ca..0fa1393 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -637,11 +637,11 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int
fd_out)
return chr;
}
-static CharDriverState *qemu_chr_open_pipe(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts)
{
int fd_in, fd_out;
char filename_in[256], filename_out[256];
- const char *filename = qemu_opt_get(opts, "path");
+ const char *filename = opts->device;
if (filename == NULL) {
fprintf(stderr, "chardev: pipe: no filename given\n");
@@ -1730,9 +1730,9 @@ static int win_chr_pipe_init(CharDriverState *chr, const
char *filename)
}
-static CharDriverState *qemu_chr_open_win_pipe(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts)
{
- const char *filename = qemu_opt_get(opts, "path");
+ const char *filename = opts->device;
CharDriverState *chr;
WinCharState *s;
@@ -2958,6 +2958,19 @@ static void qemu_chr_parse_parallel(QemuOpts *opts,
ChardevBackend *backend,
backend->parallel->device = g_strdup(device);
}
+static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend,
+ Error **errp)
+{
+ const char *device = qemu_opt_get(opts, "path");
+
+ if (device == NULL) {
+ error_setg(errp, "chardev: pipe: no device path given");
+ return;
+ }
+ backend->pipe = g_new0(ChardevHostdev, 1);
+ backend->pipe->device = g_strdup(device);
+}
+
static const struct {
const char *name;
/* old, pre qapi */
@@ -2986,11 +2999,8 @@ static const struct {
.parse = qemu_chr_parse_parallel },
{ .name = "pty", .kind = CHARDEV_BACKEND_KIND_PTY },
{ .name = "console", .kind = CHARDEV_BACKEND_KIND_CONSOLE },
-#ifdef _WIN32
- { .name = "pipe", .open = qemu_chr_open_win_pipe },
-#else
- { .name = "pipe", .open = qemu_chr_open_pipe },
-#endif
+ { .name = "pipe", .kind = CHARDEV_BACKEND_KIND_PIPE,
+ .parse = qemu_chr_parse_pipe },
{ .name = "braille", .kind = CHARDEV_BACKEND_KIND_BRAILLE },
#ifdef CONFIG_SPICE
{ .name = "spicevmc", .open = qemu_chr_open_spice },
@@ -3432,6 +3442,9 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_PARALLEL:
chr = qmp_chardev_open_parallel(backend->parallel, errp);
break;
+ case CHARDEV_BACKEND_KIND_PIPE:
+ chr = qemu_chr_open_pipe(backend->pipe);
+ break;
case CHARDEV_BACKEND_KIND_SOCKET:
chr = qmp_chardev_open_socket(backend->socket, errp);
break;
--
1.7.9.7
- [Qemu-devel] [PATCH 00/17] chardev: qapi conversion continued, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 03/17] chardev: switch null init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 05/17] chardev: add braille support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 07/17] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 08/17] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 15/17] chardev: add memory (ringbuf) support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 16/17] chardev: add udp support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 01/17] chardev: add support for qapi-based chardev initialization, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 17/17] Revert "hmp: Disable chardev-add and chardev-remove", Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 12/17] chardev: add pipe support to qapi,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 14/17] chardev: add vc support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 11/17] chardev: add console support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 13/17] chardev: add spice support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 06/17] chardev: switch file init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 02/17] chardev: add mux chardev support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 04/17] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 10/17] chardev: switch pty init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 09/17] chardev: switch parallel init to qapi, Gerd Hoffmann, 2013/02/28