On 2022/06/15 17:19, Paolo Bonzini wrote:
On 6/14/22 23:07, Akihiko Odaki wrote:diff --git a/util/cutils.c b/util/cutils.c index a58bcfd80e7..fe3bbb1c4eb 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -1086,3 +1086,36 @@ char *get_relocated_path(const char *dir) } return g_string_free(result, false); } + +static const char * const bundle_formats[] = { + "%s" G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S "%s", + "%s" G_DIR_SEPARATOR_S "qemu-bundle" G_DIR_SEPARATOR_S "%s" +};Why do you need both? Paolo
The earlier one is used when QEMU is installed. The latter one is used in the build tree.
Actually the order was problematic as Daniel pointed out. It is fixed in the v5, which I have just sent out.
On 2022/06/15 17:16, Daniel P. Berrangé wrote: > This is flawed because it looks at the installed paths first, and > falls back to uninstalled paths afterwards. So if you're building > and running QEMU 7.1.0 from git, and have QEMU 5.0.0 installed, > your QEMU 7.1.0 will end up finding files from the 5.0.0 install. Regards, Akihiko Odaki
