1. Patchew
  2. QEMU
  3. [PATCH for-8.0 00/30] Meson changes for QEMU 8.0
  4. View patch

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

Paolo Bonzini posted 30 patches 3 years ago
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, Alexandre Iooss <erdnaxe@crans.org>, Mahmoud Mandour <ma.mandourr@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Michael Roth <michael.roth@amd.com>, Konstantin Kostiuk <kkostiuk@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Richard Henderson <richard.henderson@linaro.org>
[PATCH 04/30] configure: preserve qemu-ga variables
Posted by Paolo Bonzini 3 years ago 
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>
---
 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
Re: [PATCH 04/30] configure: preserve qemu-ga variables
Posted by Daniel P. Berrangé 3 years ago 
On Fri, Dec 09, 2022 at 12:23:43PM +0100, Paolo Bonzini 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>
> ---
>  configure | 23 ++++++-----------------
>  1 file changed, 6 insertions(+), 17 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


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 :|
Re: [PATCH 04/30] configure: preserve qemu-ga variables
Posted by Marc-André Lureau 3 years ago 
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

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.