summaryrefslogtreecommitdiffstats
path: root/hw/msmouse.c
diff options
context:
space:
mode:
authormalc2011-08-05 08:07:10 +0200
committermalc2011-08-05 08:07:10 +0200
commita67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (patch)
tree146a7b6eebbee1367453fde501d4462ac6d9f8b4 /hw/msmouse.c
parentMerge branch 'master' of git://git.qemu.org/qemu (diff)
parentMerge remote-tracking branch 'mst/for_anthony' into staging (diff)
downloadqemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.gz
qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.xz
qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.zip
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/msmouse.c')
-rw-r--r--hw/msmouse.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 05f893ca93..67c6cd43e0 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(QemuOpts *opts)
+int qemu_chr_open_msmouse(QemuOpts *opts, CharDriverState **_chr)
{
CharDriverState *chr;
@@ -74,5 +74,6 @@ CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts)
qemu_add_mouse_event_handler(msmouse_event, chr, 0, "QEMU Microsoft Mouse");
- return chr;
+ *_chr = chr;
+ return 0;
}