[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v6 1/7] datadir: Simplify firmware directory search
From: |
Daniel P . Berrangé |
Subject: |
Re: [PATCH v6 1/7] datadir: Simplify firmware directory search |
Date: |
Wed, 15 Jun 2022 17:52:02 +0100 |
User-agent: |
Mutt/2.2.1 (2022-02-19) |
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.odaki@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 :|
- [PATCH v6 0/7] cutils: Introduce bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v6 1/7] datadir: Simplify firmware directory search, Akihiko Odaki, 2022/06/15
- Re: [PATCH v6 1/7] datadir: Simplify firmware directory search,
Daniel P . Berrangé <=
- [PATCH v6 2/7] qga: Relocate a path emitted in the help text, Akihiko Odaki, 2022/06/15
- [PATCH v6 3/7] Remove prefixes from path configuration macros, Akihiko Odaki, 2022/06/15
- [PATCH v6 4/7] cutils: Introduce bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v6 5/7] datadir: Use bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v6 6/7] ui/icons: Use bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v6 7/7] net: Use bundle mechanism, Akihiko Odaki, 2022/06/15
- Re: [PATCH v6 0/7] cutils: Introduce bundle mechanism, Paolo Bonzini, 2022/06/15