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