[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 42/57] fuzz: use qemu_get_exec_dir
From: |
Paolo Bonzini |
Subject: |
[PULL 42/57] fuzz: use qemu_get_exec_dir |
Date: |
Sat, 19 Sep 2020 11:59:01 -0400 |
Make things consistent with how softmmu/vl.c uses os_find_datadir.
Initializing the path to the executables will also be needed for
get_relocatable_path to work.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qtest/fuzz/fuzz.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
index e906ef9efa..1811cb1d88 100644
--- a/tests/qtest/fuzz/fuzz.c
+++ b/tests/qtest/fuzz/fuzz.c
@@ -153,6 +153,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char
***envp)
module_call_init(MODULE_INIT_QOM);
module_call_init(MODULE_INIT_LIBQOS);
+ qemu_init_exec_dir(**argv);
target_name = strstr(**argv, "-target-");
if (target_name) { /* The binary name specifies the target */
target_name += strlen("-target-");
@@ -165,7 +166,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char
***envp)
* location of the executable. Using this we add exec_dir/pc-bios to
* the datadirs.
*/
- bindir = g_path_get_dirname(**argv);
+ bindir = qemu_get_exec_dir();
datadir = g_build_filename(bindir, "pc-bios", NULL);
if (g_file_test(datadir, G_FILE_TEST_IS_DIR)) {
qemu_add_data_dir(datadir);
--
2.26.2
- [PULL 49/57] vl: relocate path to configuration file, (continued)
- [PULL 49/57] vl: relocate path to configuration file, Paolo Bonzini, 2020/09/19
- [PULL 48/57] vl: relocate paths to data directories, Paolo Bonzini, 2020/09/19
- [PULL 57/57] meson: fix installation of keymaps, Paolo Bonzini, 2020/09/19
- [PULL 55/57] exec: Remove MemoryRegion::global_locking field, Paolo Bonzini, 2020/09/19
- [PULL 27/57] scsi-generic: Fix HM-zoned device scan, Paolo Bonzini, 2020/09/19
- [PULL 30/57] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} when XSAVE is not available, Paolo Bonzini, 2020/09/19
- [PULL 46/57] module: relocate path to modules, Paolo Bonzini, 2020/09/19
- [PULL 37/57] configure: do not limit Hypervisor.framework test to Darwin, Paolo Bonzini, 2020/09/19
- [PULL 43/57] oslib-posix: default exec_dir to bindir, Paolo Bonzini, 2020/09/19
- [PULL 51/57] qga: relocate path to default configuration and hook, Paolo Bonzini, 2020/09/19
- [PULL 42/57] fuzz: use qemu_get_exec_dir,
Paolo Bonzini <=