From patchwork Thu Feb 28 07:50:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 223794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7B6572C0084 for ; Thu, 28 Feb 2013 18:53:48 +1100 (EST) Received: from localhost ([::1]:55628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAyJG-0003ts-Nm for incoming@patchwork.ozlabs.org; Thu, 28 Feb 2013 02:53:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAyG1-0007sY-2T for qemu-devel@nongnu.org; Thu, 28 Feb 2013 02:50:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAyFz-00076M-HT for qemu-devel@nongnu.org; Thu, 28 Feb 2013 02:50:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAyFz-000766-8L for qemu-devel@nongnu.org; Thu, 28 Feb 2013 02:50:23 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1S7oM6p025395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Feb 2013 02:50:22 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1S7oD18014628; Thu, 28 Feb 2013 02:50:14 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id B58F6452B9; Thu, 28 Feb 2013 08:50:10 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2013 08:50:04 +0100 Message-Id: <1362037809-27836-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1362037809-27836-1-git-send-email-kraxel@redhat.com> References: <1362037809-27836-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 12/17] chardev: add pipe support to qapi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds 'pipe' support to qapi and also switches over the pipe chardev initialization to the new qapi code path. Signed-off-by: Gerd Hoffmann --- qapi-schema.json | 3 ++- qemu-char.c | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 94a3f02..c9e9bd5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3153,7 +3153,7 @@ ## # @ChardevHostdev: # -# Configuration info for device chardevs. +# Configuration info for device and pipe chardevs. # # @device: The name of the special file for the device, # i.e. /dev/ttyS0 on Unix or COM1: on Windows @@ -3220,6 +3220,7 @@ { 'union': 'ChardevBackend', 'data': { 'file' : 'ChardevFile', 'serial' : 'ChardevHostdev', 'parallel': 'ChardevHostdev', + 'pipe' : 'ChardevHostdev', 'socket' : 'ChardevSocket', 'pty' : 'ChardevDummy', 'null' : 'ChardevDummy', diff --git a/qemu-char.c b/qemu-char.c index fe117ca..0fa1393 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -637,11 +637,11 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out) return chr; } -static CharDriverState *qemu_chr_open_pipe(QemuOpts *opts) +static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts) { int fd_in, fd_out; char filename_in[256], filename_out[256]; - const char *filename = qemu_opt_get(opts, "path"); + const char *filename = opts->device; if (filename == NULL) { fprintf(stderr, "chardev: pipe: no filename given\n"); @@ -1730,9 +1730,9 @@ static int win_chr_pipe_init(CharDriverState *chr, const char *filename) } -static CharDriverState *qemu_chr_open_win_pipe(QemuOpts *opts) +static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts) { - const char *filename = qemu_opt_get(opts, "path"); + const char *filename = opts->device; CharDriverState *chr; WinCharState *s; @@ -2958,6 +2958,19 @@ static void qemu_chr_parse_parallel(QemuOpts *opts, ChardevBackend *backend, backend->parallel->device = g_strdup(device); } +static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + const char *device = qemu_opt_get(opts, "path"); + + if (device == NULL) { + error_setg(errp, "chardev: pipe: no device path given"); + return; + } + backend->pipe = g_new0(ChardevHostdev, 1); + backend->pipe->device = g_strdup(device); +} + static const struct { const char *name; /* old, pre qapi */ @@ -2986,11 +2999,8 @@ static const struct { .parse = qemu_chr_parse_parallel }, { .name = "pty", .kind = CHARDEV_BACKEND_KIND_PTY }, { .name = "console", .kind = CHARDEV_BACKEND_KIND_CONSOLE }, -#ifdef _WIN32 - { .name = "pipe", .open = qemu_chr_open_win_pipe }, -#else - { .name = "pipe", .open = qemu_chr_open_pipe }, -#endif + { .name = "pipe", .kind = CHARDEV_BACKEND_KIND_PIPE, + .parse = qemu_chr_parse_pipe }, { .name = "braille", .kind = CHARDEV_BACKEND_KIND_BRAILLE }, #ifdef CONFIG_SPICE { .name = "spicevmc", .open = qemu_chr_open_spice }, @@ -3432,6 +3442,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, case CHARDEV_BACKEND_KIND_PARALLEL: chr = qmp_chardev_open_parallel(backend->parallel, errp); break; + case CHARDEV_BACKEND_KIND_PIPE: + chr = qemu_chr_open_pipe(backend->pipe); + break; case CHARDEV_BACKEND_KIND_SOCKET: chr = qmp_chardev_open_socket(backend->socket, errp); break;