summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-09-10 10:58:44 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-09-11 10:19:48 -0500
commit3c17affbff1e6fe363f5f3def5e219ab8c108b8e (patch)
treefdfa4bd485b50b326996ae0e3b6a584495a65ccd
parent4490dadf1d49baeceeb65478bea65c035813aebe (diff)
downloadqemu-3c17affbff1e6fe363f5f3def5e219ab8c108b8e.tar.gz
qemu-3c17affbff1e6fe363f5f3def5e219ab8c108b8e.tar.bz2
qemu-3c17affbff1e6fe363f5f3def5e219ab8c108b8e.zip
convert stdio chardev to QemuOpts.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-char.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/qemu-char.c b/qemu-char.c
index a557b544ac..df53f1200d 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);