On Thu, Jun 16, 2022 at 12:56:28AM +0900, Akihiko Odaki wrote: > The old implementation had some code to accept multiple firmware > directories, but it is not used.
It is used by distros. In Fedora builds for example: https://kojipkgs.fedoraproject.org/packages/qemu/7.0.0/1.fc37/data/logs/x86_64/build.log Passes this to configure: --firmwarepath=/usr/share/qemu-firmware:/usr/share/ipxe/qemu:/usr/share/seavgabios:/usr/share/seabios:/usr/share/sgabios > Signed-off-by: Akihiko Odaki <akihiko.od...@gmail.com> > --- > softmmu/datadir.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/softmmu/datadir.c b/softmmu/datadir.c > index 160cac999a6..2a206f2740a 100644 > --- a/softmmu/datadir.c > +++ b/softmmu/datadir.c > @@ -105,15 +105,8 @@ static char *find_datadir(void) > > void qemu_add_default_firmwarepath(void) > { > - char **dirs; > - size_t i; > - > - /* add configured firmware directories */ > - dirs = g_strsplit(CONFIG_QEMU_FIRMWAREPATH, G_SEARCHPATH_SEPARATOR_S, 0); > - for (i = 0; dirs[i] != NULL; i++) { > - qemu_add_data_dir(get_relocated_path(dirs[i])); > - } > - g_strfreev(dirs); > + /* add the configured firmware directory */ > + qemu_add_data_dir(get_relocated_path(CONFIG_QEMU_FIRMWAREPATH)); > > /* try to find datadir relative to the executable path */ > qemu_add_data_dir(find_datadir()); > -- > 2.32.1 (Apple Git-133) > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
