[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial |
Date: |
Wed, 19 Dec 2012 17:21:27 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 |
Il 19/12/2012 16:59, Gerd Hoffmann ha scritto:
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
> qapi-schema.json | 3 ++-
> qemu-char.c | 16 ++++++++++++++--
> 2 files changed, 16 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' ] }
I think 'tty' and 'serial' are really the same thing, just one for
Windows and one for Linux.
We could make one a synonym of the other, even for -chardev.
Paolo
> { 'type': 'ChardevPort', 'data': { 'device' : 'ChardevFileSource',
> 'type' : 'ChardevPortKind'} }
> diff --git a/qemu-char.c b/qemu-char.c
> index 28e4991..9f23c25 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -1662,9 +1662,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;
>
> @@ -1683,6 +1682,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;
> @@ -2957,7 +2961,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;
> @@ -3020,6 +3031,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)) {
>
- [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, 2012/12/19
- [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial, Gerd Hoffmann, 2012/12/19
- Re: [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial,
Paolo Bonzini <=
- [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
- Re: [Qemu-devel] [PATCH RfC 0/9] chardev hotplug, Michal Privoznik, 2012/12/20