Commit ef138c77 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

chardev: enable modules, use for braille 



Removes brlapi library dependency from core qemu.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20200624131045.14512-11-kraxel@redhat.com
parent 8d5a24c8

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -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)

chardev/Makefile.objs

+4 −1
Original line number Diff line number Diff line
@@ -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

chardev/char.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

util/module.c

+1 −0
Original line number Diff line number Diff line
@@ -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;