[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/23] convert windows console chardev to QemuOpt
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 15/23] convert windows console chardev to QemuOpts. |
Date: |
Thu, 10 Sep 2009 10:58:47 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 03/23] switch chardev to QemuOpts: infrastructure, null device, (continued)
- [Qemu-devel] [PATCH v2 03/23] switch chardev to QemuOpts: infrastructure, null device, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 02/23] qemu-option.h include protectors, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 06/23] sockets: add unix_listen_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 14/23] convert braille chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 08/23] sockets: add inet_connect_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 13/23] convert msmouse chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 12/23] convert stdio chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 11/23] convert pty chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 10/23] convert unix+tcp chardevs to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 09/23] sockets: add inet_listen_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 15/23] convert windows console chardev to QemuOpts.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 21/23] qdev: add parser for chardev properties, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 17/23] convert vc chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 19/23] convert udp chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 07/23] sockets: add unix_*_opts for windows., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 22/23] monitor: fix muxing, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 16/23] convert tty + parport chardevs to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 20/23] Allow -serial chardev:<name>, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 23/23] move mux focus field from CharDriverState to MuxDriver, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 18/23] convert mux chardev to QemuOpts., Gerd Hoffmann, 2009/09/10