From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsDAv-00089H-68 for qemu-devel@nongnu.org; Mon, 07 Jan 2013 08:55:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsDAs-0003RQ-7Y for qemu-devel@nongnu.org; Mon, 07 Jan 2013 08:55:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32635) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsDAs-0003R7-0e for qemu-devel@nongnu.org; Mon, 07 Jan 2013 08:55:34 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r07DtWF2011827 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Jan 2013 08:55:32 -0500 From: Gerd Hoffmann Date: Mon, 7 Jan 2013 14:55:26 +0100 Message-Id: <1357566928-25361-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1357566928-25361-1-git-send-email-kraxel@redhat.com> References: <1357566928-25361-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/11] chardev: add parport chardev support to chardev-add (qmp) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- qapi-schema.json | 3 ++- qemu-char.c | 43 +++++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index d833385..0922823 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3037,7 +3037,8 @@ 'out' : 'ChardevFileSource' } } { 'enum': 'ChardevPortKind', 'data': [ 'tty', - 'serial' ] } + 'serial', + 'parport' ] } { 'type': 'ChardevPort', 'data': { 'device' : 'ChardevFileSource', 'type' : 'ChardevPortKind'} } diff --git a/qemu-char.c b/qemu-char.c index 4232fea..5cbf44e 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1367,17 +1367,10 @@ static void pp_close(CharDriverState *chr) qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } -static CharDriverState *qemu_chr_open_pp(QemuOpts *opts) +static CharDriverState *qemu_chr_open_pp_fd(int fd) { - const char *filename = qemu_opt_get(opts, "path"); CharDriverState *chr; ParallelCharDriver *drv; - int fd; - - TFR(fd = qemu_open(filename, O_RDWR)); - if (fd < 0) { - return NULL; - } if (ioctl(fd, PPCLAIM) < 0) { close(fd); @@ -1441,16 +1434,9 @@ static int pp_ioctl(CharDriverState *chr, int cmd, void *arg) return 0; } -static CharDriverState *qemu_chr_open_pp(QemuOpts *opts) +static CharDriverState *qemu_chr_open_pp_fd(int fd) { - const char *filename = qemu_opt_get(opts, "path"); CharDriverState *chr; - int fd; - - fd = qemu_open(filename, O_RDWR); - if (fd < 0) { - return NULL; - } chr = g_malloc0(sizeof(CharDriverState)); chr->opaque = (void *)(intptr_t)fd; @@ -2750,6 +2736,22 @@ fail: return NULL; } +#ifdef HAVE_CHARDEV_PARPORT + +static CharDriverState *qemu_chr_open_pp(QemuOpts *opts) +{ + const char *filename = qemu_opt_get(opts, "path"); + int fd; + + fd = qemu_open(filename, O_RDWR); + if (fd < 0) { + return NULL; + } + return qemu_chr_open_pp_fd(fd); +} + +#endif + static const struct { const char *name; CharDriverState *(*open)(QemuOpts *opts); @@ -3053,6 +3055,15 @@ static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp) } return qemu_chr_open_tty_fd(fd); #endif +#ifdef HAVE_CHARDEV_PARPORT + case CHARDEV_PORT_KIND_PARPORT: + flags = O_RDWR; + fd = qmp_chardev_open_file_source(port->device, flags, errp); + if (error_is_set(errp)) { + return NULL; + } + return qemu_chr_open_pp_fd(fd); +#endif default: error_setg(errp, "unknown chardev port (%d)", port->type); return NULL; -- 1.7.1