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

convert msmouse chardev to QemuOpts. 

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:45 +02:00 committed by Anthony Liguori
parent 3c17affbff
commit f0457e8d88
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/msmouse.c
View File

@ -64,7 +64,7 @@ static void msmouse_chr_close (struct CharDriverState *chr)
qemu_free (chr); qemu_free (chr);
} }
CharDriverState *qemu_chr_open_msmouse(void) CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts)
{ {
CharDriverState *chr; CharDriverState *chr;

2
hw/msmouse.h
View File

@ -1,2 +1,2 @@
/* msmouse.c */ /* msmouse.c */
CharDriverState *qemu_chr_open_msmouse(void); CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts);

10
qemu-char.c
View File

@ -2226,9 +2226,10 @@ 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 ||
strcmp(filename, "pty") == 0 || strcmp(filename, "pty") == 0 ||
strcmp(filename, "stdio") == 0) { strcmp(filename, "msmouse") == 0 ||
strcmp(filename, "stdio") == 0) {
qemu_opt_set(opts, "backend", filename); qemu_opt_set(opts, "backend", filename);
return opts; return opts;
} }
@ -2279,6 +2280,7 @@ static const struct {
} backend_table[] = { } backend_table[] = {
{ .name = "null", .open = qemu_chr_open_null }, { .name = "null", .open = qemu_chr_open_null },
{ .name = "socket", .open = qemu_chr_open_socket }, { .name = "socket", .open = qemu_chr_open_socket },
{ .name = "msmouse", .open = qemu_chr_open_msmouse },
#ifdef _WIN32 #ifdef _WIN32
{ .name = "file", .open = qemu_chr_open_win_file_out }, { .name = "file", .open = qemu_chr_open_win_file_out },
{ .name = "pipe", .open = qemu_chr_open_win_pipe }, { .name = "pipe", .open = qemu_chr_open_win_pipe },
@ -2354,8 +2356,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i
} else { } else {
printf("Unable to open driver: %s\n", p); printf("Unable to open driver: %s\n", p);
} }
} else if (!strcmp(filename, "msmouse")) {
chr = qemu_chr_open_msmouse();
} else } else
#ifndef _WIN32 #ifndef _WIN32
#if defined(__linux__) #if defined(__linux__)