falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-09-29 15:29:15 +02:00
parent 3c0e5a4a84
commit 96d885b93b
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backends/msmouse.c
View File

@ -63,7 +63,10 @@ static void msmouse_chr_close (struct CharDriverState *chr)
g_free (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; CharDriverState *chr;
@ -80,7 +83,7 @@ CharDriverState *qemu_chr_open_msmouse(void)
static void register_types(void) static void register_types(void)
{ {
register_char_driver("msmouse", CHARDEV_BACKEND_KIND_MSMOUSE, NULL, register_char_driver("msmouse", CHARDEV_BACKEND_KIND_MSMOUSE, NULL,
NULL); qemu_chr_open_msmouse);
} }
type_init(register_types); type_init(register_types);

3
include/sysemu/char.h
View File

@ -356,9 +356,6 @@ extern int term_escape_char;
CharDriverState *qemu_char_get_next_serial(void); CharDriverState *qemu_char_get_next_serial(void);
/* msmouse */
CharDriverState *qemu_chr_open_msmouse(void);
/* testdev.c */ /* testdev.c */
CharDriverState *chr_testdev_init(void); CharDriverState *chr_testdev_init(void);

2
qemu-char.c
View File

@ -4312,7 +4312,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
abort(); abort();
break; break;
case CHARDEV_BACKEND_KIND_MSMOUSE: case CHARDEV_BACKEND_KIND_MSMOUSE:
chr = qemu_chr_open_msmouse(); abort();
break; break;
#ifdef CONFIG_BRLAPI #ifdef CONFIG_BRLAPI
case CHARDEV_BACKEND_KIND_BRAILLE: case CHARDEV_BACKEND_KIND_BRAILLE:

1
stubs/Makefile.objs
View File

@ -1,7 +1,6 @@
stub-obj-y += arch-query-cpu-def.o stub-obj-y += arch-query-cpu-def.o
stub-obj-y += bdrv-commit-all.o stub-obj-y += bdrv-commit-all.o
stub-obj-y += chr-baum-init.o stub-obj-y += chr-baum-init.o
stub-obj-y += chr-msmouse.o
stub-obj-y += chr-testdev.o stub-obj-y += chr-testdev.o
stub-obj-y += clock-warp.o stub-obj-y += clock-warp.o
stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-clock.o

7
stubs/chr-msmouse.c
View File

@ -1,7 +0,0 @@
#include "qemu-common.h"
#include "sysemu/char.h"
CharDriverState *qemu_chr_open_msmouse(void)
{
return 0;
}