| Submitter | Gerd Hoffmann |
|---|---|
| Date | Dec. 19, 2012, 3:59 p.m. |
| Message ID | <1355932747-1755-9-git-send-email-kraxel@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/207432/ |
| State | New |
| Headers | show |
Comments
Il 19/12/2012 16:59, Gerd Hoffmann ha scritto: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > 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)) { >
On 12/19/12 17:21, Paolo Bonzini wrote: > Il 19/12/2012 16:59, Gerd Hoffmann ha scritto: >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >> --- >> 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. Partly disagree. tty is a very unix-ish concept, having that on windows would be confusing I think. serial lines happen to be a subset of tty on linux. The patch aliases serial to tty on unix because of that. > We could make one a synonym of the other, even for -chardev. Makes sense to be consistent here. cheers, Gerd
Patch
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 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)) {
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- qapi-schema.json | 3 ++- qemu-char.c | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-)