Re: [PATCH 04/30] configure: preserve qemu-ga variables

[Marc-André Lureau]

On Fri, Dec 9, 2022 at 3:28 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Ensure that qemu-ga variables set at configure time are kept
> later when the script is rerun.  For preserve_env to work,
> the variables need to be empty so move the default values
> to config-host.mak generation.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  configure | 23 ++++++-----------------
>  1 file changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/configure b/configure
> index db2b45740449..4d14ff9c319c 100755
> --- a/configure
> +++ b/configure
> @@ -2222,20 +2222,6 @@ if test "$have_ubsan" = "yes"; then
>    QEMU_LDFLAGS="-fsanitize=undefined $QEMU_LDFLAGS"
>  fi
>
> -##########################################
> -# Guest agent Windows MSI package
> -
> -if test "$QEMU_GA_MANUFACTURER" = ""; then
> -  QEMU_GA_MANUFACTURER=QEMU
> -fi
> -if test "$QEMU_GA_DISTRO" = ""; then
> -  QEMU_GA_DISTRO=Linux
> -fi
> -if test "$QEMU_GA_VERSION" = ""; then
> -    QEMU_GA_VERSION=$(cat "$source_path"/VERSION)
> -fi
> -
> -
>  #######################################
>  # cross-compiled firmware targets
>
> @@ -2331,9 +2317,9 @@ if test "$debug_tcg" = "yes" ; then
>  fi
>  if test "$mingw32" = "yes" ; then
>    echo "CONFIG_WIN32=y" >> $config_host_mak
> -  echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
> -  echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
> -  echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak
> +  echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> 
> $config_host_mak
> +  echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO-Linux}" >> $config_host_mak
> +  echo "QEMU_GA_VERSION=${QEMU_GA_VERSION-$(cat "$source_path"/VERSION)}" >> 
> $config_host_mak
>  else
>    echo "CONFIG_POSIX=y" >> $config_host_mak
>  fi
> @@ -2647,6 +2633,9 @@ preserve_env PKG_CONFIG
>  preserve_env PKG_CONFIG_LIBDIR
>  preserve_env PKG_CONFIG_PATH
>  preserve_env PYTHON
> +preserve_env QEMU_GA_MANUFACTURER
> +preserve_env QEMU_GA_DISTRO
> +preserve_env QEMU_GA_VERSION
>  preserve_env SDL2_CONFIG
>  preserve_env SMBD
>  preserve_env STRIP
> --
> 2.38.1
>
>


-- 
Marc-André Lureau