OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

convert pty chardev to QemuOpts.

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-09-10 10:58:43 +02:00 committed by Anthony Liguori
parent aeb2c47a1e
commit 4490dadf1d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-char.c
View File

@ -956,7 +956,7 @@ static void pty_chr_close(struct CharDriverState *chr)
qemu_chr_event(chr, CHR_EVENT_CLOSED); qemu_chr_event(chr, CHR_EVENT_CLOSED);
} }
static CharDriverState *qemu_chr_open_pty(void) static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
{ {
CharDriverState *chr; CharDriverState *chr;
PtyCharDriver *s; PtyCharDriver *s;
@ -986,6 +986,7 @@ static CharDriverState *qemu_chr_open_pty(void)
len = strlen(q_ptsname(s->fd)) + 5; len = strlen(q_ptsname(s->fd)) + 5;
chr->filename = qemu_malloc(len); chr->filename = qemu_malloc(len);
snprintf(chr->filename, len, "pty:%s", q_ptsname(s->fd)); 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)); fprintf(stderr, "char device redirected to %s\n", q_ptsname(s->fd));
chr->opaque = s; chr->opaque = s;
@ -2225,8 +2226,9 @@ static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename)
if (NULL == opts) if (NULL == opts)
return NULL; return NULL;
if (strcmp(filename, "null") == 0) { if (strcmp(filename, "null") == 0 ||
qemu_opt_set(opts, "backend", "null"); strcmp(filename, "pty") == 0) {
qemu_opt_set(opts, "backend", filename);
return opts; return opts;
} }
if (strstart(filename, "file:", &p)) { if (strstart(filename, "file:", &p)) {
@ -2282,6 +2284,7 @@ static const struct {
#else #else
{ .name = "file", .open = qemu_chr_open_file_out }, { .name = "file", .open = qemu_chr_open_file_out },
{ .name = "pipe", .open = qemu_chr_open_pipe }, { .name = "pipe", .open = qemu_chr_open_pipe },
{ .name = "pty", .open = qemu_chr_open_pty },
#endif #endif
}; };
@ -2353,9 +2356,7 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i
chr = qemu_chr_open_msmouse(); chr = qemu_chr_open_msmouse();
} else } else
#ifndef _WIN32 #ifndef _WIN32
if (!strcmp(filename, "pty")) { if (!strcmp(filename, "stdio")) {
chr = qemu_chr_open_pty();
} else if (!strcmp(filename, "stdio")) {
chr = qemu_chr_open_stdio(); chr = qemu_chr_open_stdio();
} else } else
#if defined(__linux__) #if defined(__linux__)