Re: [Qemu-devel] [PATCH 2/2] Add --firmwarepath to configure
On 14/09/2017 10:36, Gerd Hoffmann wrote: > Hi, > >>> + --firmwarepath=PATH search PATH for firmware files >> >> Maybe --firmwaredir or --with-firmwaredir (because firmwaredir is not >> one of the "standard" directories)? > > I've intentionally named this "path" because it can actually have > multiple directories. > > Or do you mean something else? If so --verbose please. No, you're right. Paolo >>> +/* add configured firmware directories */ >>> +dirs = g_strsplit(CONFIG_QEMU_FIRMWAREPATH, ":", 0); >> >> Windows probably wants to use ; here, so you can use >> G_SEARCHPATH_SEPARATOR_S instead of ":". > > Ah, cool, didn't know this exists. Fixing ... > > cheers, > Gerd >
Re: [Qemu-devel] [PATCH 2/2] Add --firmwarepath to configure
Hi, > > + --firmwarepath=PATH search PATH for firmware files > > Maybe --firmwaredir or --with-firmwaredir (because firmwaredir is not > one of the "standard" directories)? I've intentionally named this "path" because it can actually have multiple directories. Or do you mean something else? If so --verbose please. > > +/* add configured firmware directories */ > > +dirs = g_strsplit(CONFIG_QEMU_FIRMWAREPATH, ":", 0); > > Windows probably wants to use ; here, so you can use > G_SEARCHPATH_SEPARATOR_S instead of ":". Ah, cool, didn't know this exists. Fixing ... cheers, Gerd
Re: [Qemu-devel] [PATCH 2/2] Add --firmwarepath to configure
On 13/09/2017 14:09, Gerd Hoffmann wrote:
> Add a firmware path config option to configure. Multiple directories
> are accepted, with the usual colon as separator. Default value is
> ${prefix}/share/qemu-firmware. The path is searched in addition to the
> current search path (typically ${prefix}/share/qemu).
>
> This prepares qemu for the planned split of the prebuilt firmware blobs
> into a separate project.
>
> Distributions can also use this to get rid of the firmware symlink farm
> and add -- for example -- /usr/share/seabios to the firmware path
> instead.
>
> Signed-off-by: Gerd Hoffmann
> ---
> configure | 6 ++
> vl.c | 12 +---
> scripts/create_config | 2 +-
> 3 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index fd7e3a5e81..870bdbd3e4 100755
> --- a/configure
> +++ b/configure
> @@ -332,6 +332,7 @@ modules="no"
> prefix="/usr/local"
> mandir="\${prefix}/share/man"
> datadir="\${prefix}/share"
> +firmwarepath="\${prefix}/share/qemu-firmware"
> qemu_docdir="\${prefix}/share/doc/qemu"
> bindir="\${prefix}/bin"
> libdir="\${prefix}/lib"
> @@ -915,6 +916,8 @@ for opt do
>;;
>--localstatedir=*) local_statedir="$optarg"
>;;
> + --firmwarepath=*) firmwarepath="$optarg"
> + ;;
>--sbindir=*|--sharedstatedir=*|\
>--oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
>--htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
> @@ -1418,6 +1421,7 @@ Advanced options (experts only):
>--libdir=PATHinstall libraries in PATH
>--sysconfdir=PATHinstall config in PATH$confsuffix
>--localstatedir=PATH install local state in PATH (set at runtime on
> win32)
> + --firmwarepath=PATH search PATH for firmware files
Maybe --firmwaredir or --with-firmwaredir (because firmwaredir is not
one of the "standard" directories)?
> @@ -4232,11 +4233,16 @@ int main(int argc, char **argv, char **envp)
> qemu_set_log(0);
> }
>
> -/* If no data_dir is specified then try to find it relative to the
> - executable path. */
> +/* add configured firmware directories */
> +dirs = g_strsplit(CONFIG_QEMU_FIRMWAREPATH, ":", 0);
Windows probably wants to use ; here, so you can use
G_SEARCHPATH_SEPARATOR_S instead of ":".
Thanks,
Paolo
> +for (i = 0; dirs[i] != NULL; i++) {
> +qemu_add_data_dir(dirs[i]);
> +}
> +
> +/* try to find datadir relative to the executable path */
> qemu_add_data_dir(os_find_datadir());
>
> -/* If all else fails use the install path specified when building. */
> +/* add the datadir specified when building */
> qemu_add_data_dir(CONFIG_QEMU_DATADIR);
>
> /* -L help lists the data directories and exits. */
> diff --git a/scripts/create_config b/scripts/create_config
> index e6929dd61e..603b826886 100755
> --- a/scripts/create_config
> +++ b/scripts/create_config
> @@ -15,7 +15,7 @@ case $line in
> echo "#define QEMU_VERSION_MINOR $minor"
> echo "#define QEMU_VERSION_MICRO $micro"
> ;;
> - qemu_*dir=*) # qemu-specific directory configuration
> + qemu_*dir=* | qemu_*path=*) # qemu-specific directory configuration
> name=${line%=*}
> value=${line#*=}
> define_name=$(echo $name | LC_ALL=C tr '[a-z]' '[A-Z]')
>
[Qemu-devel] [PATCH 2/2] Add --firmwarepath to configure
Add a firmware path config option to configure. Multiple directories
are accepted, with the usual colon as separator. Default value is
${prefix}/share/qemu-firmware. The path is searched in addition to the
current search path (typically ${prefix}/share/qemu).
This prepares qemu for the planned split of the prebuilt firmware blobs
into a separate project.
Distributions can also use this to get rid of the firmware symlink farm
and add -- for example -- /usr/share/seabios to the firmware path
instead.
Signed-off-by: Gerd Hoffmann
---
configure | 6 ++
vl.c | 12 +---
scripts/create_config | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index fd7e3a5e81..870bdbd3e4 100755
--- a/configure
+++ b/configure
@@ -332,6 +332,7 @@ modules="no"
prefix="/usr/local"
mandir="\${prefix}/share/man"
datadir="\${prefix}/share"
+firmwarepath="\${prefix}/share/qemu-firmware"
qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
libdir="\${prefix}/lib"
@@ -915,6 +916,8 @@ for opt do
;;
--localstatedir=*) local_statedir="$optarg"
;;
+ --firmwarepath=*) firmwarepath="$optarg"
+ ;;
--sbindir=*|--sharedstatedir=*|\
--oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
--htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
@@ -1418,6 +1421,7 @@ Advanced options (experts only):
--libdir=PATHinstall libraries in PATH
--sysconfdir=PATHinstall config in PATH$confsuffix
--localstatedir=PATH install local state in PATH (set at runtime on
win32)
+ --firmwarepath=PATH search PATH for firmware files
--with-confsuffix=SUFFIX suffix for QEMU data inside
datadir/libdir/sysconfdir [$confsuffix]
--enable-debug enable common debug build options
--disable-strip disable stripping binaries
@@ -5259,6 +5263,7 @@ libs_softmmu="$pixman_libs $libs_softmmu"
echo "Install prefix$prefix"
echo "BIOS directory$(eval echo $qemu_datadir)"
+echo "firmware path $(eval echo $firmwarepath)"
echo "binary directory $(eval echo $bindir)"
echo "library directory $(eval echo $libdir)"
echo "module directory $(eval echo $qemu_moddir)"
@@ -5450,6 +5455,7 @@ echo "mandir=$mandir" >> $config_host_mak
echo "sysconfdir=$sysconfdir" >> $config_host_mak
echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
+echo "qemu_firmwarepath=$firmwarepath" >> $config_host_mak
echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
echo "qemu_moddir=$qemu_moddir" >> $config_host_mak
if test "$mingw32" = "no" ; then
diff --git a/vl.c b/vl.c
index 37a3401920..8f4bbe3825 100644
--- a/vl.c
+++ b/vl.c
@@ -3048,6 +3048,7 @@ int main(int argc, char **argv, char **envp)
Error *main_loop_err = NULL;
Error *err = NULL;
bool list_data_dirs = false;
+char **dirs;
typedef struct BlockdevOptions_queue {
BlockdevOptions *bdo;
Location loc;
@@ -4232,11 +4233,16 @@ int main(int argc, char **argv, char **envp)
qemu_set_log(0);
}
-/* If no data_dir is specified then try to find it relative to the
- executable path. */
+/* add configured firmware directories */
+dirs = g_strsplit(CONFIG_QEMU_FIRMWAREPATH, ":", 0);
+for (i = 0; dirs[i] != NULL; i++) {
+qemu_add_data_dir(dirs[i]);
+}
+
+/* try to find datadir relative to the executable path */
qemu_add_data_dir(os_find_datadir());
-/* If all else fails use the install path specified when building. */
+/* add the datadir specified when building */
qemu_add_data_dir(CONFIG_QEMU_DATADIR);
/* -L help lists the data directories and exits. */
diff --git a/scripts/create_config b/scripts/create_config
index e6929dd61e..603b826886 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -15,7 +15,7 @@ case $line in
echo "#define QEMU_VERSION_MINOR $minor"
echo "#define QEMU_VERSION_MICRO $micro"
;;
- qemu_*dir=*) # qemu-specific directory configuration
+ qemu_*dir=* | qemu_*path=*) # qemu-specific directory configuration
name=${line%=*}
value=${line#*=}
define_name=$(echo $name | LC_ALL=C tr '[a-z]' '[A-Z]')
--
2.9.3
