From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mkgjt-0007UF-QL for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mkgjn-0007PN-Nz for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:44 -0400 Received: from [199.232.76.173] (port=34953 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mkgjn-0007PB-9Y for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3434) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mkgjm-0003VW-K7 for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:38 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n87G6b3t014191 for ; Mon, 7 Sep 2009 12:06:38 -0400 From: Gerd Hoffmann Date: Mon, 7 Sep 2009 18:06:14 +0200 Message-Id: <1252339585-27797-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1252339585-27797-1-git-send-email-kraxel@redhat.com> References: <1252339585-27797-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 12/23] convert stdio chardev to QemuOpts. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 ef6ab87..f649280 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 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); -- 1.6.2.5