From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
berrange@redhat.com, qemu-block@nongnu.org,
"Michael S. Tsirkin" <mst@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Cornelia Huck" <cohuck@redhat.com>, "Peter Lieven" <pl@kamp.de>,
"Markus Armbruster" <armbru@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
qemu-s390x@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eric Blake" <eblake@redhat.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>
Subject: [PATCH v2 01/18] modules: add metadata macros, add qxl module annotations
Date: Thu, 10 Jun 2021 07:57:38 +0200 [thread overview]
Message-ID: <20210610055755.538119-2-kraxel@redhat.com> (raw)
In-Reply-To: <20210610055755.538119-1-kraxel@redhat.com>
Stealing an idea from the linux kernel: Place module metadata
in an .modinfo elf section. This patch adds macros and qxl module
annotations as example.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/qemu/module.h | 22 ++++++++++++++++++++++
hw/display/qxl.c | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 944d403cbd15..d3cab3c25a2f 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -73,4 +73,26 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail);
void module_load_qom_one(const char *type);
void module_load_qom_all(void);
+/*
+ * macros to store module metadata in a .modinfo section.
+ * qemu-modinfo utility will collect the metadata.
+ *
+ * Use "objdump -t -s -j .modinfo ${module}.so" to inspect.
+ */
+
+#define ___PASTE(a, b) a##b
+#define __PASTE(a, b) ___PASTE(a, b)
+
+#define modinfo(kind, value) \
+ static const char __PASTE(kind, __LINE__)[] \
+ __attribute__((__used__)) \
+ __attribute__((section(".modinfo"))) \
+ __attribute__((aligned(1))) \
+ = stringify(kind) "=" value
+
+#define module_obj(name) modinfo(obj, name)
+#define module_dep(name) modinfo(dep, name)
+#define module_arch(name) modinfo(arch, name)
+#define module_opts(name) modinfo(opts, name)
+
#endif
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 6e1f8ff1b2a7..84f99088e0a0 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -2522,6 +2522,7 @@ static const TypeInfo qxl_primary_info = {
.parent = TYPE_PCI_QXL,
.class_init = qxl_primary_class_init,
};
+module_obj("qxl-vga");
static void qxl_secondary_class_init(ObjectClass *klass, void *data)
{
@@ -2538,6 +2539,7 @@ static const TypeInfo qxl_secondary_info = {
.parent = TYPE_PCI_QXL,
.class_init = qxl_secondary_class_init,
};
+module_obj("qxl");
static void qxl_register_types(void)
{
@@ -2547,3 +2549,5 @@ static void qxl_register_types(void)
}
type_init(qxl_register_types)
+
+module_dep("ui-spice-core");
--
2.31.1
next prev parent reply other threads:[~2021-06-10 6:02 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 5:57 [PATCH v2 00/18] modules: add metadata database Gerd Hoffmann
2021-06-10 5:57 ` Gerd Hoffmann [this message]
2021-06-10 5:57 ` [PATCH v2 02/18] qapi: add ModuleInfo schema Gerd Hoffmann
2021-06-14 7:48 ` Markus Armbruster
2021-06-14 15:21 ` Gerd Hoffmann
2021-06-14 16:53 ` Markus Armbruster
2021-06-10 5:57 ` [PATCH v2 03/18] modules: add qemu-modinfo utility Gerd Hoffmann
2021-06-10 13:04 ` Gerd Hoffmann
2021-06-10 13:13 ` Daniel P. Berrangé
2021-06-14 8:34 ` Paolo Bonzini
2021-06-14 14:36 ` Paolo Bonzini
2021-06-15 4:49 ` Gerd Hoffmann
2021-06-15 7:56 ` Gerd Hoffmann
2021-06-15 13:07 ` Gerd Hoffmann
2021-06-15 13:35 ` Paolo Bonzini
2021-06-16 9:16 ` Gerd Hoffmann
2021-06-16 10:53 ` Paolo Bonzini
2021-06-14 15:01 ` Gerd Hoffmann
2021-06-14 15:08 ` Daniel P. Berrangé
2021-06-15 4:54 ` Gerd Hoffmann
2021-06-15 9:27 ` Daniel P. Berrangé
2021-06-10 5:57 ` [PATCH v2 04/18] modules: add virtio-gpu module annotations Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 05/18] modules: add chardev " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 06/18] modules: add audio " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 07/18] modules: add usb-redir " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 08/18] modules: add ccid " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 09/18] modules: add ui " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 10/18] modules: add s390x " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 11/18] modules: add block " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 12/18] modules: add module_load_path_init helper Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 13/18] modules: load modinfo.json Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 14/18] modules: use modinfo for dependencies Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 15/18] modules: use modinfo for qom load Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 16/18] modules: use modinfo for qemu opts load Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 17/18] modules: check arch and block load on mismatch Gerd Hoffmann
2021-06-10 12:35 ` Daniel P. Berrangé
2021-06-10 12:57 ` Gerd Hoffmann
2021-06-10 13:06 ` Daniel P. Berrangé
2021-06-10 14:03 ` Gerd Hoffmann
2021-06-14 11:23 ` Claudio Fontana
2021-06-14 13:44 ` Gerd Hoffmann
2021-06-14 13:52 ` Daniel P. Berrangé
2021-06-14 14:10 ` Gerd Hoffmann
2021-06-14 11:19 ` Claudio Fontana
2021-06-10 5:57 ` [PATCH v2 18/18] [fixup] module_load_modinfo Gerd Hoffmann
2021-06-10 6:24 ` Gerd Hoffmann
2021-06-10 8:32 ` [PATCH v2 00/18] modules: add metadata database Claudio Fontana
2021-06-10 9:54 ` Gerd Hoffmann
2021-06-14 11:31 ` Claudio Fontana
2021-06-14 14:07 ` 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=20210610055755.538119-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=ronniesahlberg@gmail.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=thuth@redhat.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).