[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/23] convert msmouse chardev to QemuOpts.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 13/23] convert msmouse chardev to QemuOpts. |
Date: |
Mon, 7 Sep 2009 18:06:15 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/msmouse.c | 2 +-
hw/msmouse.h | 2 +-
qemu-char.c | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 69356a5..05f893c 100644
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -64,7 +64,7 @@ static void msmouse_chr_close (struct CharDriverState *chr)
qemu_free (chr);
}
-CharDriverState *qemu_chr_open_msmouse(void)
+CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts)
{
CharDriverState *chr;
diff --git a/hw/msmouse.h b/hw/msmouse.h
index 947afd9..456cb21 100644
--- a/hw/msmouse.h
+++ b/hw/msmouse.h
@@ -1,2 +1,2 @@
/* msmouse.c */
-CharDriverState *qemu_chr_open_msmouse(void);
+CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts);
diff --git a/qemu-char.c b/qemu-char.c
index f649280..b8ed7be 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2226,9 +2226,10 @@ static QemuOpts *qemu_chr_parse_compat(const char
*label, const char *filename)
if (NULL == opts)
return NULL;
- if (strcmp(filename, "null") == 0 ||
- strcmp(filename, "pty") == 0 ||
- strcmp(filename, "stdio") == 0) {
+ if (strcmp(filename, "null") == 0 ||
+ strcmp(filename, "pty") == 0 ||
+ strcmp(filename, "msmouse") == 0 ||
+ strcmp(filename, "stdio") == 0) {
qemu_opt_set(opts, "backend", filename);
return opts;
}
@@ -2279,6 +2280,7 @@ static struct {
} backend_table[] = {
{ .name = "null", .open = qemu_chr_open_null },
{ .name = "socket", .open = qemu_chr_open_socket },
+ { .name = "msmouse", .open = qemu_chr_open_msmouse },
#ifdef _WIN32
{ .name = "file", .open = qemu_chr_open_win_file_out },
{ .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 {
printf("Unable to open driver: %s\n", p);
}
- } else if (!strcmp(filename, "msmouse")) {
- chr = qemu_chr_open_msmouse();
} else
#ifndef _WIN32
#if defined(__linux__)
--
1.6.2.5
- [Qemu-devel] [PATCH 05/23] sockets: add unix_connect_opts, (continued)
- [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, 2009/09/07
- [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 <=
- [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
- [Qemu-devel] [PATCH 23/23] move mux focus field from CharDriverState to MuxDriver, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 22/23] monitor: fix muxing, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 20/23] Allow -serial chardev:<name>, Gerd Hoffmann, 2009/09/07