From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlM3B-0000GX-Cw for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:59:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlM38-000816-5R for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:59:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlM37-00080m-Tu for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:59:14 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBJFxDm3027904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 10:59:13 -0500 From: Gerd Hoffmann Date: Wed, 19 Dec 2012 16:59:06 +0100 Message-Id: <1355932747-1755-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1355932747-1755-1-git-send-email-kraxel@redhat.com> References: <1355932747-1755-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 8/9] chardev: hotplug, qmp, serial List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Gerd Hoffmann , mprivozn@redhat.com Signed-off-by: Gerd Hoffmann --- 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' ] } { '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)) { -- 1.7.1