qemu-char: convert msmouse backend to data-driven creation

Reviewed-by: Eric Blake <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/backends/msmouse.c b/backends/msmouse.c
index d50ed479a57cb19883ce82820960531ea8ee5f85..0126fa0b130ffbb59c135a2fc51626aa51de75ea 100644 (file)
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -63,7 +63,10 @@ static void msmouse_chr_close (struct CharDriverState *chr)
     g_free (chr);
 }
 
-CharDriverState *qemu_chr_open_msmouse(void)
+static CharDriverState *qemu_chr_open_msmouse(const char *id,
+                                              ChardevBackend *backend,
+                                              ChardevReturn *ret,
+                                              Error **errp)
 {
     CharDriverState *chr;
 
@@ -80,7 +83,7 @@ CharDriverState *qemu_chr_open_msmouse(void)
 static void register_types(void)
 {
     register_char_driver("msmouse", CHARDEV_BACKEND_KIND_MSMOUSE, NULL,
-                         NULL);
+                         qemu_chr_open_msmouse);
 }
 
 type_init(register_types);

diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 4b01a8c26a086dd41bd81f2afc5dfbfea7ab29f0..2fe827551cac971554d752bdff4997a5df4246c8 100644 (file)
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -356,9 +356,6 @@ extern int term_escape_char;
 
 CharDriverState *qemu_char_get_next_serial(void);
 
-/* msmouse */
-CharDriverState *qemu_chr_open_msmouse(void);
-
 /* testdev.c */
 CharDriverState *chr_testdev_init(void);
 

diff --git a/qemu-char.c b/qemu-char.c
index 6f2202a3f9c9497ec48271a48c41fe6440acde0d..64ca39761d2fefca66eaa572ed324cab1b16e238 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4312,7 +4312,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
             abort();
             break;
         case CHARDEV_BACKEND_KIND_MSMOUSE:
-            chr = qemu_chr_open_msmouse();
+            abort();
             break;
 #ifdef CONFIG_BRLAPI
         case CHARDEV_BACKEND_KIND_BRAILLE:

diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 85e4e810176bf6b7e9754a1bac4507196e04fbd4..63988ca75e488e8fd3999c7f6f1a89e2c2baa3ef 100644 (file)
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -1,7 +1,6 @@
 stub-obj-y += arch-query-cpu-def.o
 stub-obj-y += bdrv-commit-all.o
 stub-obj-y += chr-baum-init.o
-stub-obj-y += chr-msmouse.o
 stub-obj-y += chr-testdev.o
 stub-obj-y += clock-warp.o
 stub-obj-y += cpu-get-clock.o

diff --git a/stubs/chr-msmouse.c b/stubs/chr-msmouse.c
deleted file mode 100644 (file)
index 812f8b0..0000000
--- a/stubs/chr-msmouse.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu-common.h"
-#include "sysemu/char.h"
-
-CharDriverState *qemu_chr_open_msmouse(void)
-{
-    return 0;
-}