[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] chardev: add serial chardev support to charde
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 08/11] chardev: add serial chardev support to chardev-add (qmp) |
Date: |
Mon, 7 Jan 2013 14:55:25 +0100 |
Add support for serial chardevs. Windup qemu_chr_open_win() on
Windows, alias to 'tty' on Linux.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qapi-schema.json | 3 ++-
qemu-char.c | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 7e5c8c2..d833385 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3036,7 +3036,8 @@
{ 'type': 'ChardevFile', 'data': { '*in' : 'ChardevFileSource',
'out' : 'ChardevFileSource' } }
-{ 'enum': 'ChardevPortKind', 'data': [ 'tty' ] }
+{ 'enum': 'ChardevPortKind', 'data': [ 'tty',
+ 'serial' ] }
{ 'type': 'ChardevPort', 'data': { 'device' : 'ChardevFileSource',
'type' : 'ChardevPortKind'} }
diff --git a/qemu-char.c b/qemu-char.c
index 764321b..4232fea 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1672,9 +1672,8 @@ static int win_chr_poll(void *opaque)
return 0;
}
-static CharDriverState *qemu_chr_open_win(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_win_path(const char *filename)
{
- const char *filename = qemu_opt_get(opts, "path");
CharDriverState *chr;
WinCharState *s;
@@ -1693,6 +1692,11 @@ static CharDriverState *qemu_chr_open_win(QemuOpts *opts)
return chr;
}
+static CharDriverState *qemu_chr_open_win(QemuOpts *opts)
+{
+ return qemu_chr_open_win_path(qemu_opt_get(opts, "path"));
+}
+
static int win_chr_pipe_poll(void *opaque)
{
CharDriverState *chr = opaque;
@@ -2771,6 +2775,7 @@ static const struct {
#endif
#ifdef HAVE_CHARDEV_TTY
{ .name = "tty", .open = qemu_chr_open_tty },
+ { .name = "serial", .open = qemu_chr_open_tty },
{ .name = "pty", .open = qemu_chr_open_pty },
#endif
#ifdef HAVE_CHARDEV_PARPORT
@@ -2970,7 +2975,14 @@ static CharDriverState
*qmp_chardev_open_file(ChardevFile *file, Error **errp)
static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp)
{
+ if (port->device->kind != CHARDEV_FILE_SOURCE_KIND_PATH) {
+ error_setg(errp, "only file paths supported");
+ return NULL;
+ }
+
switch (port->type) {
+ case CHARDEV_PORT_KIND_SERIAL:
+ return qemu_chr_open_win_path(port->device->path);
default:
error_setg(errp, "unknown chardev port (%d)", port->type);
return NULL;
@@ -3033,6 +3045,7 @@ static CharDriverState *qmp_chardev_open_port(ChardevPort
*port, Error **errp)
switch (port->type) {
#ifdef HAVE_CHARDEV_TTY
case CHARDEV_PORT_KIND_TTY:
+ case CHARDEV_PORT_KIND_SERIAL:
flags = O_RDWR | O_NONBLOCK;
fd = qmp_chardev_open_file_source(port->device, flags, errp);
if (error_is_set(errp)) {
--
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, 2013/01/07
- [Qemu-devel] [PATCH 08/11] chardev: add serial chardev support to chardev-add (qmp),
Gerd Hoffmann <=
[Qemu-devel] [PATCH 05/11] chardev: add hmp hotplug commands, Gerd Hoffmann, 2013/01/07
[Qemu-devel] [PATCH 10/11] chardev: add socket chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/07