openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

chardev: enable modules, use for braille 

Removes brlapi library dependency from core qemu.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200624131045.14512-11-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-06-24 15:10:45 +02:00
parent 8d5a24c83d
commit ef138c7724
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -71,6 +71,7 @@ common-obj-$(CONFIG_TPM) += tpm.o
common-obj-y += backends/ common-obj-y += backends/
common-obj-y += chardev/ common-obj-y += chardev/
common-obj-m += chardev/
common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS) qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)

5
chardev/Makefile.objs
View File

@ -18,8 +18,11 @@ chardev-obj-$(CONFIG_WIN32) += char-win.o
chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
common-obj-y += msmouse.o wctablet.o testdev.o common-obj-y += msmouse.o wctablet.o testdev.o
common-obj-$(CONFIG_BRLAPI) += baum.o
ifeq ($(CONFIG_BRLAPI),y)
common-obj-m += baum.o
baum.o-cflags := $(SDL_CFLAGS) baum.o-cflags := $(SDL_CFLAGS)
baum.o-libs := $(BRLAPI_LIBS) baum.o-libs := $(BRLAPI_LIBS)
endif
common-obj-$(CONFIG_SPICE) += spice.o common-obj-$(CONFIG_SPICE) += spice.o

2
chardev/char.c
View File

@ -527,7 +527,7 @@ static const ChardevClass *char_get_class(const char *driver, Error **errp)
const ChardevClass *cc; const ChardevClass *cc;
char *typename = g_strdup_printf("chardev-%s", driver); char *typename = g_strdup_printf("chardev-%s", driver);
oc = object_class_by_name(typename); oc = module_object_class_by_name(typename);
g_free(typename); g_free(typename);
if (!object_class_dynamic_cast(oc, TYPE_CHARDEV)) { if (!object_class_dynamic_cast(oc, TYPE_CHARDEV)) {

1
util/module.c
View File

@ -272,6 +272,7 @@ static struct {
{ "vhost-user-gpu-device", "hw-", "display-virtio-gpu" }, { "vhost-user-gpu-device", "hw-", "display-virtio-gpu" },
{ "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" }, { "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" },
{ "vhost-user-vga", "hw-", "display-virtio-gpu" }, { "vhost-user-vga", "hw-", "display-virtio-gpu" },
{ "chardev-braille", "chardev-", "baum" },
}; };
static bool module_loaded_qom_all; static bool module_loaded_qom_all;