[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/23] convert pty chardev to QemuOpts.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/23] convert pty chardev to QemuOpts. |
Date: |
Mon, 7 Sep 2009 18:06:13 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-char.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index c5ea5be..ef6ab87 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -956,7 +956,7 @@ static void pty_chr_close(struct CharDriverState *chr)
qemu_chr_event(chr, CHR_EVENT_CLOSED);
}
-static CharDriverState *qemu_chr_open_pty(void)
+static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
{
CharDriverState *chr;
PtyCharDriver *s;
@@ -986,6 +986,7 @@ static CharDriverState *qemu_chr_open_pty(void)
len = strlen(q_ptsname(s->fd)) + 5;
chr->filename = qemu_malloc(len);
snprintf(chr->filename, len, "pty:%s", q_ptsname(s->fd));
+ qemu_opt_set(opts, "path", q_ptsname(s->fd));
fprintf(stderr, "char device redirected to %s\n", q_ptsname(s->fd));
chr->opaque = s;
@@ -2225,8 +2226,9 @@ static QemuOpts *qemu_chr_parse_compat(const char *label,
const char *filename)
if (NULL == opts)
return NULL;
- if (strcmp(filename, "null") == 0) {
- qemu_opt_set(opts, "backend", "null");
+ if (strcmp(filename, "null") == 0 ||
+ strcmp(filename, "pty") == 0) {
+ qemu_opt_set(opts, "backend", filename);
return opts;
}
if (strstart(filename, "file:", &p)) {
@@ -2282,6 +2284,7 @@ static struct {
#else
{ .name = "file", .open = qemu_chr_open_file_out },
{ .name = "pipe", .open = qemu_chr_open_pipe },
+ { .name = "pty", .open = qemu_chr_open_pty },
#endif
};
@@ -2353,9 +2356,7 @@ CharDriverState *qemu_chr_open(const char *label, const
char *filename, void (*i
chr = qemu_chr_open_msmouse();
} else
#ifndef _WIN32
- if (!strcmp(filename, "pty")) {
- chr = qemu_chr_open_pty();
- } else if (!strcmp(filename, "stdio")) {
+ if (!strcmp(filename, "stdio")) {
chr = qemu_chr_open_stdio();
} else
#if defined(__linux__)
--
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 <=
- [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, 2009/09/07
- [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