Patchwork [v2,12/23] convert stdio chardev to QemuOpts.

login
register
mail settings
Submitter Gerd Hoffmann
Date Sept. 10, 2009, 8:58 a.m.
Message ID <1252573135-27688-13-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/33282/
State Superseded
Headers show

Comments

Gerd Hoffmann - Sept. 10, 2009, 8:58 a.m.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qemu-char.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/qemu-char.c b/qemu-char.c
index a557b54..df53f12 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);