module fixes
cover module fixes
Gerd Hoffmann (3):
qxl: fix modular builds with dtrace
module: ignore NULL type
module: silence errors for module_load_qom_all().
include/qemu/module.h | 8 ++++---- hw/display/qxl.c | 9 +++++++++ softmmu/qtest.c | 2 +- util/module.c | 20 +++++++++++++------- 4 files changed, 27 insertions(+), 12 deletions(-)
Signature · 1 line
2.18.4
PATCH 1/3 qxl: fix modular builds with dtrace
Checking the enable/disable state of tracepoints via trace_event_get_state_backends() does not work for modules.
qxl checks the state for a small optimization (avoid g_strndup call in case log_buf will not be used anyway), so we can just drop that check for modular builds.
--- hw/display/qxl.c | 9 +++++++++ 1 file changed, 9 insertions(+)
hw/display/qxl.c +9 -0
@@ -1762,7 +1762,16 @@ async_common:qxl_set_mode (d, val,0 );break ;case QXL_IO_LOG : +#ifdef CONFIG_MODULES +/* +* FIXME +* trace_event_get_state_backends() does not work for modules, +* it leads to "undefined symbol: qemu_qxl_io_log_semaphore" +*/ +if (true) { +#else if (trace_event_get_state_backends (TRACE_QXL_IO_LOG ) || d->guestdebug) { +#endif /* We cannot trust the guest to NUL terminate d->ram->log_buf */ char *log_buf =g_strndup ((const char *)d->ram->log_buf,sizeof (d->ram->log_buf));
Signature · 1 line
2.18.4
PATCH 2/3 module: ignore NULL type
In reply to Gerd HoffmannJust return in case module_load_qom_one(NULL) is called. vga_interface_available() can do that.
--- util/module.c | 3 +++ 1 file changed, 3 insertions(+)
util/module.c +3 -0
@@ -275,6 +275,9 @@ void module_load_qom_one(const char *type) {int i; +if (!type) { +return ; + }if (module_loaded_qom_all) {return ; }
Signature · 1 line
2.18.4
PATCH 3/3 module: silence errors for module_load_qom_all().
In reply to Gerd HoffmannAdd mayfail bool parameter to module loading functions. Set it to true for module_load_qom_all() because device modules might not load into all system emulation variants. qemu-system-s390x for example will not load qxl because it lacks vga support. Makes "make check" less chatty.
--- include/qemu/module.h | 8 ++++---- softmmu/qtest.c | 2 +- util/module.c | 17 ++++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-)
include/qemu/module.h +4 -4
@@ -61,15 +61,15 @@ typedef enum {#define fuzz_target_init (function) module_init(function, \ MODULE_INIT_FUZZ_TARGET)#define migration_init (function) module_init(function, MODULE_INIT_MIGRATION) -#define block_module_load_one (lib) module_load_one("block-", lib) -#define ui_module_load_one (lib) module_load_one("ui-", lib) -#define audio_module_load_one (lib) module_load_one("audio-", lib) +#define block_module_load_one (lib) module_load_one("block-", lib, false) +#define ui_module_load_one (lib) module_load_one("ui-", lib, false) +#define audio_module_load_one (lib) module_load_one("audio-", lib, false)void register_module_init (void (*fn)(void ),module_init_type type);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); +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 );
softmmu/qtest.c +1 -1
@@ -670,7 +670,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)g_assert (words[1 ] && words[2 ]);qtest_send_prefix (chr); -if (module_load_one (words[1 ], words[2 ])) { +if (module_load_one (words[1 ], words[2 ], false)) {qtest_sendf (chr,"OK\n" ); }else {qtest_sendf (chr,"FAIL\n" );
util/module.c +10 -7
@@ -109,7 +109,7 @@ void module_call_init(module_init_type type) }#ifdef CONFIG_MODULES -static int module_load_file (const char *fname) +static int module_load_file (const char *fname,bool mayfail) {GModule *g_module;void (*sym)(void );
@@ -133,8 +133,10 @@ static int module_load_file(const char *fname) g_module =g_module_open (fname,G_MODULE_BIND_LAZY |G_MODULE_BIND_LOCAL );if (!g_module) { -fprintf (stderr,"Failed to open module: %s\n" , -g_module_error ()); +if (!mayfail) { +fprintf (stderr,"Failed to open module: %s\n" , +g_module_error ()); + } ret = -EINVAL ; goto out; }
@@ -166,7 +168,7 @@ out: }#endif -bool module_load_one (const char *prefix,const char *lib_name) +bool module_load_one (const char *prefix,const char *lib_name,bool mayfail) {bool success = false;
@@ -223,7 +225,7 @@ bool module_load_one(const char *prefix, const char *lib_name)for (i =0 ; i < n_dirs; i++) { fname =g_strdup_printf ("%s/%s%s" , dirs[i], module_name,HOST_DSOSUF ); - ret =module_load_file (fname); + ret =module_load_file (fname, mayfail);g_free (fname); fname =NULL ;/* Try loading until loaded a module file */
@@ -284,7 +286,8 @@ void module_load_qom_one(const char *type)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); + qom_modules[i].module, + false);return ; } }
@@ -305,7 +308,7 @@ void module_load_qom_all(void)/* one module implementing multiple types -> load only once */ continue ; } -module_load_one (qom_modules[i].prefix, qom_modules[i].module); +module_load_one (qom_modules[i].prefix, qom_modules[i].module, true); } module_loaded_qom_all = true; }
Signature · 1 line
2.18.4