qemu-char: convert msmouse backend to data-driven creation Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/backends/msmouse.c b/backends/msmouse.c index d50ed47..0126fa0 100644 --- a/backends/msmouse.c +++ b/backends/msmouse.c
@@ -63,7 +63,10 @@ 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 @@ 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 4b01a8c..2fe8275 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h
@@ -356,9 +356,6 @@ 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 6f2202a..64ca397 100644 --- a/qemu-char.c +++ b/qemu-char.c
@@ -4312,7 +4312,7 @@ 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 85e4e81..63988ca 100644 --- 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 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; -}