From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
dinechin@redhat.com, "Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: [PATCH v5 10/10] chardev: enable modules, use for braille
Date: Wed, 24 Jun 2020 15:10:45 +0200 [thread overview]
Message-ID: <20200624131045.14512-11-kraxel@redhat.com> (raw)
In-Reply-To: <20200624131045.14512-1-kraxel@redhat.com>
Removes brlapi library dependency from core qemu.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile.objs | 1 +
chardev/char.c | 2 +-
util/module.c | 1 +
chardev/Makefile.objs | 5 ++++-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index ca555ede0710..2dfcd19713f8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -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)
diff --git a/chardev/char.c b/chardev/char.c
index e3051295ac37..df697f3ce9e0 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -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)) {
diff --git a/util/module.c b/util/module.c
index a74214eac052..32b0547b8266 100644
--- a/util/module.c
+++ b/util/module.c
@@ -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;
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
index d68e1347f9af..3a58c9d329d6 100644
--- a/chardev/Makefile.objs
+++ b/chardev/Makefile.objs
@@ -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.18.4
next prev parent reply other threads:[~2020-06-24 13:18 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 13:10 [PATCH v5 00/10] build some devices as modules Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 01/10] module: qom module support Gerd Hoffmann
2020-07-20 14:16 ` Christophe de Dinechin
2020-07-21 14:16 ` Gerd Hoffmann
2022-09-05 9:17 ` Claudio Fontana
2022-09-05 14:21 ` Philippe Mathieu-Daudé via
2020-06-24 13:10 ` [PATCH v5 02/10] object: " Gerd Hoffmann
2020-07-20 14:20 ` Christophe de Dinechin
2020-07-21 14:26 ` Gerd Hoffmann
2020-07-21 14:35 ` Daniel P. Berrangé
2020-07-22 8:06 ` Christophe de Dinechin
2020-07-22 11:07 ` Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 03/10] qdev: device " Gerd Hoffmann
2020-07-20 14:25 ` Christophe de Dinechin
2020-07-21 14:27 ` Gerd Hoffmann
2020-07-22 8:05 ` Christophe de Dinechin
2020-07-22 11:05 ` Gerd Hoffmann
2020-07-22 14:39 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 04/10] build: fix device module builds Gerd Hoffmann
2020-07-20 14:00 ` Christophe de Dinechin
2020-07-21 14:30 ` Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 05/10] ccid: build smartcard as module Gerd Hoffmann
2020-07-20 14:30 ` Christophe de Dinechin
2020-07-21 14:33 ` Gerd Hoffmann
2020-07-22 8:08 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 06/10] usb: build usb-redir " Gerd Hoffmann
2020-07-20 14:43 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 07/10] vga: build qxl " Gerd Hoffmann
2020-07-20 15:01 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 08/10] vga: build virtio-gpu only once Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 09/10] vga: build virtio-gpu as module Gerd Hoffmann
2020-07-20 15:03 ` Christophe de Dinechin
2020-06-24 13:10 ` Gerd Hoffmann [this message]
2020-07-20 15:06 ` [PATCH v5 10/10] chardev: enable modules, use for braille Christophe de Dinechin
2020-07-21 14:35 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200624131045.14512-11-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=dinechin@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).