Skip to content

Commit

Permalink
chardev: enable modules, use for braille
Browse files Browse the repository at this point in the history
Removes brlapi library dependency from core qemu.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200624131045.14512-11-kraxel@redhat.com
  • Loading branch information
kraxel committed Jul 7, 2020
1 parent 8d5a24c commit ef138c7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile.objs
Expand Up @@ -71,6 +71,7 @@ common-obj-$(CONFIG_TPM) += tpm.o

common-obj-y += backends/
common-obj-y += chardev/
common-obj-m += chardev/

common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
Expand Down
5 changes: 4 additions & 1 deletion chardev/Makefile.objs
Expand Up @@ -18,8 +18,11 @@ chardev-obj-$(CONFIG_WIN32) += char-win.o
chardev-obj-$(CONFIG_WIN32) += char-win-stdio.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-libs := $(BRLAPI_LIBS)
endif

common-obj-$(CONFIG_SPICE) += spice.o
2 changes: 1 addition & 1 deletion chardev/char.c
Expand Up @@ -527,7 +527,7 @@ static const ChardevClass *char_get_class(const char *driver, Error **errp)
const ChardevClass *cc;
char *typename = g_strdup_printf("chardev-%s", driver);

oc = object_class_by_name(typename);
oc = module_object_class_by_name(typename);
g_free(typename);

if (!object_class_dynamic_cast(oc, TYPE_CHARDEV)) {
Expand Down
1 change: 1 addition & 0 deletions util/module.c
Expand Up @@ -272,6 +272,7 @@ static struct {
{ "vhost-user-gpu-device", "hw-", "display-virtio-gpu" },
{ "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" },
{ "vhost-user-vga", "hw-", "display-virtio-gpu" },
{ "chardev-braille", "chardev-", "baum" },
};

static bool module_loaded_qom_all;
Expand Down

0 comments on commit ef138c7

Please sign in to comment.