[v1] Audio patches

[PULL 17/85] util: add some extra stubs for qemu modules initialization

marcandre.lureau@redhat.com posted 85 patches 1 month, 3 weeks ago

Diff against v1 v1 v1 v2 v3 v5 v6
Download mbox

Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>, Laurent Vivier <laurent@vivier.eu>, "Michael S. Tsirkin" <mst@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>

There is a newer version of this series

Expand all Fold all

[PULL 17/85] util: add some extra stubs for qemu modules initialization

Posted by marcandre.lureau@redhat.com 1 month, 3 weeks ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Avoid extra ifdef-ery when optionally supporting modules, as done in
audio-test (and vl.c).

Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 system/vl.c   | 2 --
 util/module.c | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/vl.c b/system/vl.c
index aa9a1550417..3e341142a0c 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2889,10 +2889,8 @@ void qemu_init(int argc, char **argv)
 
     os_setup_limits();
 
-#ifdef CONFIG_MODULES
     module_init_info(qemu_modinfo);
     module_allow_arch(target_name());
-#endif
 
     qemu_init_subsystems();
 
diff --git a/util/module.c b/util/module.c
index 1aa2079d013..09dc43f51eb 100644
--- a/util/module.c
+++ b/util/module.c
@@ -396,6 +396,9 @@ void qemu_load_module_for_opts(const char *group)
 
 #else
 
+const QemuModinfo qemu_modinfo[] = {};
+
+void module_init_info(const QemuModinfo *info) {}
 void module_allow_arch(const char *arch) {}
 void qemu_load_module_for_opts(const char *group) {}
 int module_load(const char *prefix, const char *name, Error **errp) { return 2; }
-- 
2.53.0