From 64ed6f92ffebb419ba71ef61e7bdb5f165c5043a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 3 Aug 2020 17:04:25 +0200 Subject: meson: link emulators without Makefile.target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The binaries move to the root directory, e.g. qemu-system-i386 or qemu-arm. This requires changes to qtests, CI, etc. Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- util/module.c | 1 - 1 file changed, 1 deletion(-) (limited to 'util/module.c') diff --git a/util/module.c b/util/module.c index 0ab00851f0..c956ef096b 100644 --- a/util/module.c +++ b/util/module.c @@ -205,7 +205,6 @@ bool module_load_one(const char *prefix, const char *lib_name) dirs[n_dirs++] = g_strdup_printf("%s", search_dir); } dirs[n_dirs++] = g_strdup_printf("%s", CONFIG_QEMU_MODDIR); - dirs[n_dirs++] = g_strdup_printf("%s/..", exec_dir ? : ""); dirs[n_dirs++] = g_strdup_printf("%s", exec_dir ? : ""); #ifdef CONFIG_MODULE_UPGRADES -- cgit v1.2.3 From 859aef026e51a4959d1ab535f0b7a00d63ed32ba Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 4 Aug 2020 18:14:26 +0200 Subject: meson: replace create-config with meson configure_file Move the create-config logic to meson.build; create a configuration_data object and let meson handle the quoting and output. Signed-off-by: Paolo Bonzini --- util/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/module.c') diff --git a/util/module.c b/util/module.c index c956ef096b..6e63006a8f 100644 --- a/util/module.c +++ b/util/module.c @@ -113,7 +113,7 @@ static int module_load_file(const char *fname) { GModule *g_module; void (*sym)(void); - const char *dsosuf = HOST_DSOSUF; + const char *dsosuf = CONFIG_HOST_DSOSUF; int len = strlen(fname); int suf_len = strlen(dsosuf); ModuleEntry *e, *next; @@ -221,7 +221,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); + dirs[i], module_name, CONFIG_HOST_DSOSUF); ret = module_load_file(fname); g_free(fname); fname = NULL; -- cgit v1.2.3