From patchwork Thu Sep 10 08:58:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id C4B7EB7093 for ; Thu, 10 Sep 2009 19:24:28 +1000 (EST) Received: from localhost ([127.0.0.1]:33515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlftB-0003oa-51 for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 05:24:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlfUs-0005Uh-Ke for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlfUm-0005RW-Gh for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:17 -0400 Received: from [199.232.76.173] (port=49324 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlfUm-0005Qu-1f for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57497) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlfUj-0007Wi-KG for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:10 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A8x88W022727 for ; Thu, 10 Sep 2009 04:59:08 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-74.ams2.redhat.com [10.36.9.74]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8A8x3di030975; Thu, 10 Sep 2009 04:59:04 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 99CCA700EB; Thu, 10 Sep 2009 10:58:56 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 10:58:44 +0200 Message-Id: <1252573135-27688-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1252573135-27688-1-git-send-email-kraxel@redhat.com> References: <1252573135-27688-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 12/23] convert stdio chardev to QemuOpts. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- qemu-char.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index a557b54..df53f12 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -758,7 +758,7 @@ static void qemu_chr_close_stdio(struct CharDriverState *chr) fd_chr_close(chr); } -static CharDriverState *qemu_chr_open_stdio(void) +static CharDriverState *qemu_chr_open_stdio(QemuOpts *opts) { CharDriverState *chr; @@ -2227,7 +2227,8 @@ static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) return NULL; if (strcmp(filename, "null") == 0 || - strcmp(filename, "pty") == 0) { + strcmp(filename, "pty") == 0 || + strcmp(filename, "stdio") == 0) { qemu_opt_set(opts, "backend", filename); return opts; } @@ -2285,6 +2286,7 @@ static const struct { { .name = "file", .open = qemu_chr_open_file_out }, { .name = "pipe", .open = qemu_chr_open_pipe }, { .name = "pty", .open = qemu_chr_open_pty }, + { .name = "stdio", .open = qemu_chr_open_stdio }, #endif }; @@ -2356,9 +2358,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i chr = qemu_chr_open_msmouse(); } else #ifndef _WIN32 - if (!strcmp(filename, "stdio")) { - chr = qemu_chr_open_stdio(); - } else #if defined(__linux__) if (strstart(filename, "/dev/parport", NULL)) { chr = qemu_chr_open_pp(filename);