From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlfUv-0005Wk-Ct for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlfUp-0005Sf-RD for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:20 -0400 Received: from [199.232.76.173] (port=49332 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlfUp-0005SZ-Ih for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6743) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlfUo-0007Xg-Bi for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:15 -0400 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.13.8/8.13.8) with ESMTP id n8A8xDwd022562 for ; Thu, 10 Sep 2009 04:59:13 -0400 From: Gerd Hoffmann Date: Thu, 10 Sep 2009 10:58:47 +0200 Message-Id: <1252573135-27688-16-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> Subject: [Qemu-devel] [PATCH v2 15/23] convert windows console 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 | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 345a9d6..074fc22 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1701,7 +1701,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out) return chr; } -static CharDriverState *qemu_chr_open_win_con(const char *filename) +static CharDriverState *qemu_chr_open_win_con(QemuOpts *opts) { return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE)); } @@ -2234,6 +2234,10 @@ static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) qemu_opt_set(opts, "backend", filename); return opts; } + if (strcmp(filename, "con:") == 0) { + qemu_opt_set(opts, "backend", "console"); + return opts; + } if (strstart(filename, "file:", &p)) { qemu_opt_set(opts, "backend", "file"); qemu_opt_set(opts, "path", p); @@ -2285,6 +2289,7 @@ static const struct { #ifdef _WIN32 { .name = "file", .open = qemu_chr_open_win_file_out }, { .name = "pipe", .open = qemu_chr_open_win_pipe }, + { .name = "console", .open = qemu_chr_open_win_con }, #else { .name = "file", .open = qemu_chr_open_file_out }, { .name = "pipe", .open = qemu_chr_open_pipe }, @@ -2381,9 +2386,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i if (strstart(filename, "COM", NULL)) { chr = qemu_chr_open_win(filename); } else - if (strstart(filename, "con:", NULL)) { - chr = qemu_chr_open_win_con(filename); - } else #endif { chr = NULL; -- 1.6.2.5