[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/23] convert stdio chardev to QemuOpts.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 12/23] convert stdio chardev to QemuOpts. |
Date: |
Mon, 7 Sep 2009 18:06:14 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/23] switch sockets+chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 03/23] switch chardev to QemuOpts: infrastructure, null device, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 02/23] qemu-option.h include protectors, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 05/23] sockets: add unix_connect_opts, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 04/23] convert file+pipe chardevs to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 07/23] sockets: add unix_*_opts for windows., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 06/23] sockets: add unix_listen_opts, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 11/23] convert pty chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 14/23] convert braille chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 12/23] convert stdio chardev to QemuOpts.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/23] convert unix+tcp chardevs to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 01/23] QemuOpts: split option parser into two functions., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 08/23] sockets: add inet_connect_opts, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 13/23] convert msmouse chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 09/23] sockets: add inet_listen_opts, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 15/23] convert windows console chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 21/23] qdev: add parser for chardev properties, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 17/23] convert vc chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 23/23] move mux focus field from CharDriverState to MuxDriver, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 22/23] monitor: fix muxing, Gerd Hoffmann, 2009/09/07