From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PULL 01/10] module: qom module support
Date: Tue, 7 Jul 2020 15:42:20 +0200 [thread overview]
Message-ID: <20200707134229.9773-2-kraxel@redhat.com> (raw)
In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com>
Add support for qom types provided by modules. For starters use a
manually maintained list which maps qom type to module and prefix.
Two load functions are added: One to load the module for a specific
type, and one to load all modules (needed for object/device lists as
printed by -- for example -- qemu -device help).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200624131045.14512-2-kraxel@redhat.com
---
include/qemu/module.h | 2 ++
util/module.c | 55 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 011ae1ae7605..9121a475c1b6 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -70,5 +70,7 @@ void register_dso_module_init(void (*fn)(void), module_init_type type);
void module_call_init(module_init_type type);
bool module_load_one(const char *prefix, const char *lib_name);
+void module_load_qom_one(const char *type);
+void module_load_qom_all(void);
#endif
diff --git a/util/module.c b/util/module.c
index e48d9aacc05a..ee560a4b4269 100644
--- a/util/module.c
+++ b/util/module.c
@@ -245,3 +245,58 @@ bool module_load_one(const char *prefix, const char *lib_name)
#endif
return success;
}
+
+/*
+ * Building devices and other qom objects modular is mostly useful in
+ * case they have dependencies to external shared libraries, so we can
+ * cut down the core qemu library dependencies. Which is the case for
+ * only a very few devices & objects.
+ *
+ * So with the expectation that this will be rather the exception than
+ * to rule and the list will not gain that many entries go with a
+ * simple manually maintained list for now.
+ */
+static struct {
+ const char *type;
+ const char *prefix;
+ const char *module;
+} const qom_modules[] = {
+};
+
+static bool module_loaded_qom_all;
+
+void module_load_qom_one(const char *type)
+{
+ int i;
+
+ if (module_loaded_qom_all) {
+ return;
+ }
+ for (i = 0; i < ARRAY_SIZE(qom_modules); i++) {
+ if (strcmp(qom_modules[i].type, type) == 0) {
+ module_load_one(qom_modules[i].prefix,
+ qom_modules[i].module);
+ return;
+ }
+ }
+}
+
+void module_load_qom_all(void)
+{
+ int i;
+
+ if (module_loaded_qom_all) {
+ return;
+ }
+ for (i = 0; i < ARRAY_SIZE(qom_modules); i++) {
+ if (i > 0 && (strcmp(qom_modules[i - 1].module,
+ qom_modules[i].module) == 0 &&
+ strcmp(qom_modules[i - 1].prefix,
+ qom_modules[i].prefix) == 0)) {
+ /* one module implementing multiple types -> load only once */
+ continue;
+ }
+ module_load_one(qom_modules[i].prefix, qom_modules[i].module);
+ }
+ module_loaded_qom_all = true;
+}
--
2.18.4
next prev parent reply other threads:[~2020-07-07 13:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 13:42 [PULL 00/10] Modules 20200707 patches Gerd Hoffmann
2020-07-07 13:42 ` Gerd Hoffmann [this message]
2020-07-07 13:42 ` [PULL 02/10] object: qom module support Gerd Hoffmann
2020-07-07 13:42 ` [PULL 03/10] qdev: device " Gerd Hoffmann
2020-07-07 13:42 ` [PULL 04/10] build: fix device module builds Gerd Hoffmann
2020-07-07 13:42 ` [PULL 05/10] ccid: build smartcard as module Gerd Hoffmann
2020-07-07 13:42 ` [PULL 06/10] usb: build usb-redir " Gerd Hoffmann
2020-07-07 13:42 ` [PULL 07/10] vga: build qxl " Gerd Hoffmann
2020-07-07 13:42 ` [PULL 08/10] vga: build virtio-gpu only once Gerd Hoffmann
2020-07-07 13:42 ` [PULL 09/10] vga: build virtio-gpu as module Gerd Hoffmann
2020-07-07 13:42 ` [PULL 10/10] chardev: enable modules, use for braille Gerd Hoffmann
2020-07-09 19:01 ` [PULL 00/10] Modules 20200707 patches Peter Maydell
2020-07-10 8:12 ` Thomas Huth
2020-07-10 16:58 ` Philippe Mathieu-Daudé
-- strict thread matches above, loose matches on Subject: below --
2020-07-02 12:20 [PULL 00/10] Modules 20200702 patches Gerd Hoffmann
2020-07-02 12:20 ` [PULL 01/10] module: qom module support 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=20200707134229.9773-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@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).