From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CACBEC433EF for ; Thu, 5 May 2022 09:13:12 +0000 (UTC) Received: from localhost ([::1]:52466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmXXr-0005AJ-LF for qemu-devel@archiver.kernel.org; Thu, 05 May 2022 05:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmWo6-0002an-8X for qemu-devel@nongnu.org; Thu, 05 May 2022 04:25:54 -0400 Received: from us-smtp-delivery-74.mimecast.com ([170.10.129.74]:41114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmWo3-0001X0-Ot for qemu-devel@nongnu.org; Thu, 05 May 2022 04:25:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651739147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kd/9z55GN9SxgvATcD9ygwJV0M9E2WT2z6q/BW1h6BQ=; b=YkGr4dzEN6tUmI0844xQslM938u8UGQeQqScGdJXfepoASWF1tlxSTqRBpUXNxIOdombFV x8wWntzVuBxisV4ocfvdWCxOflXyZWCvprbTO2piggH8iO3lRnZq7AIXnfVjOyEOiNfnqN c2M9olpBhBL0/FawJaQR+9ou0Ks7tBE= Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-tahSf8u1NeGKtpZlIl57jQ-1; Thu, 05 May 2022 04:25:46 -0400 X-MC-Unique: tahSf8u1NeGKtpZlIl57jQ-1 Received: by mail-yb1-f199.google.com with SMTP id h14-20020a25e20e000000b006484e4a1da2so3114595ybe.9 for ; Thu, 05 May 2022 01:25:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=kd/9z55GN9SxgvATcD9ygwJV0M9E2WT2z6q/BW1h6BQ=; b=ZAL6QCYL+OUg/Y5kY0fAa9cVjpFnEH7n2YonBNJVRd0WsspU1lwMydbI1vaBi8lqs0 U8QRDpONgY2MDUtibowuUoBEQoFz4E8QTo5zpI/wtMEaVp4kuNgo9i9vLZmvATwWYP6R mS1p1RqyaW75jgtF5oZlKyBjQjxgnINdwmDGN84M1i7+6HIa/hJXFreMVoqYhSPlrTce urXV93+idbbhjsPe2eQiYcoU9CceEAmc8Y8VXKwx3DTkmHHs5Ql/IKxPC5uw7tABFc9Z S9eaV4iowIaTJo2w07JgNZcaJl6mjykS/nIXjvbZXTE7CKe/YckeN8Nu+DkXSOhL9U4D yX+w== X-Gm-Message-State: AOAM530i3O3NOd0tvgimufguDZZ0PCvPht6Ihij06gKZnDkAiUKuIgxC bM9HOTy5PzeliBRZVC16FsoomMI9Siu5NCDWYCHSC9mDtSxQWngXYX4cuuN3e1ZWi3ZtDD86cLm jeqtk+yd3g0E1kTFLmus52Y86AOzZCrA= X-Received: by 2002:a05:690c:113:b0:2ef:260b:3801 with SMTP id bd19-20020a05690c011300b002ef260b3801mr25821739ywb.49.1651739145780; Thu, 05 May 2022 01:25:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMcRccxSyWO+z+3+KpbQwu6HQFVvhd1nCMppAlCTJ0BUGFLR8iopQPAYG+KWHcA5Xv4BKCDC3uIYN1eeQdY9E= X-Received: by 2002:a05:690c:113:b0:2ef:260b:3801 with SMTP id bd19-20020a05690c011300b002ef260b3801mr25821724ywb.49.1651739145571; Thu, 05 May 2022 01:25:45 -0700 (PDT) MIME-Version: 1.0 References: <20220505081431.934739-1-marcandre.lureau@redhat.com> <20220505081431.934739-12-marcandre.lureau@redhat.com> In-Reply-To: <20220505081431.934739-12-marcandre.lureau@redhat.com> From: Konstantin Kostiuk Date: Thu, 5 May 2022 11:25:34 +0300 Message-ID: Subject: Re: [PATCH v2 11/15] qga/wixl: prefer variables over environment To: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Cc: QEMU , Alexander Bulekov , Bandan Das , Thomas Huth , Hanna Reitz , Markus Armbruster , Stefan Weil , Kevin Wolf , Darren Kenny , Laurent Vivier , Michael Roth , Paolo Bonzini , Qiuhao Li , Stefan Hajnoczi , qemu-block@nongnu.org Content-Type: multipart/alternative; boundary="000000000000089d4505de3f7d05" Received-SPF: pass client-ip=170.10.129.74; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-74.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000089d4505de3f7d05 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Konstantin Kostiuk On Thu, May 5, 2022 at 11:16 AM wrote: > From: Marc-Andr=C3=A9 Lureau > > No need to setup an environment or to check if the variable is undefined > manually. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > qga/installer/qemu-ga.wxs | 30 +++++++++--------------------- > qga/meson.build | 9 ++++----- > 2 files changed, 13 insertions(+), 26 deletions(-) > > diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs > index 0950e8c6becc..8a19aa165651 100644 > --- a/qga/installer/qemu-ga.wxs > +++ b/qga/installer/qemu-ga.wxs > @@ -1,17 +1,5 @@ > > > - > - > - > - > - > - > - > - > - > - > - > - > > > > @@ -43,20 +31,20 @@ > Name=3D"QEMU guest agent" > Id=3D"*" > UpgradeCode=3D"{EB6B8302-C06E-4BEC-ADAC-932C68A3A98D}" > - Manufacturer=3D"$(env.QEMU_GA_MANUFACTURER)" > - Version=3D"$(env.QEMU_GA_VERSION)" > + Manufacturer=3D"$(var.QEMU_GA_MANUFACTURER)" > + Version=3D"$(var.QEMU_GA_VERSION)" > Language=3D"1033"> > > installed on 64-bit Windows.">NOT VersionNT64 > > - Manufacturer=3D"$(env.QEMU_GA_MANUFACTURER)" > + Manufacturer=3D"$(var.QEMU_GA_MANUFACTURER)" > InstallerVersion=3D"200" > Languages=3D"1033" > Compressed=3D"yes" > InstallScope=3D"perMachine" > /> > - EmbedCab=3D"yes" /> > + EmbedCab=3D"yes" /> > 1 > DowngradeErrorMessage=3D"Error: A newer version of QEMU guest agen= t > is already installed." > @@ -66,7 +54,7 @@ > > > Guid=3D"{908B7199-DE2A-4DC6-A8D0-27A5AE444FEA}"> > - Source=3D"$(env.BUILD_DIR)/qga/qemu-ga.exe" KeyPath=3D"yes" DiskId=3D"1"/= > > + Source=3D"$(var.BUILD_DIR)/qga/qemu-ga.exe" KeyPath=3D"yes" DiskId=3D"1"/= > > Id=3D"ServiceInstaller" > Type=3D"ownProcess" > @@ -88,10 +76,10 @@ > Source=3D"$(var.Mingw_bin)/libstdc++-6.dll" KeyPath=3D"yes" DiskId=3D"1"/= > > > Guid=3D"{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}"> > - Source=3D"$(env.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath=3D"yes" > DiskId=3D"1"/> > + Source=3D"$(var.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath=3D"yes" > DiskId=3D"1"/> > > Guid=3D"{D8D584B1-59C2-4FB7-A91F-636FF7BFA66E}"> > - Source=3D"$(env.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath=3D"yes" > DiskId=3D"1"/> > + Source=3D"$(var.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath=3D"yes" > DiskId=3D"1"/> > > > > @@ -133,9 +121,9 @@ > > Guid=3D"{D075D109-51CA-11E3-9F8B-000C29858960}"> > - > Key=3D"Software\$(env.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\= QemuGA"> > + > Key=3D"Software\$(var.QEMU_GA_MANUFACTURER)\$(var.QEMU_GA_DISTRO)\Tools\= QemuGA"> > Value=3D"fb0a0d66-c7fb-4e2e-a16b-c4a3bfe8d13b" /> > - Value=3D"$(env.QEMU_GA_VERSION)" /> > + Value=3D"$(var.QEMU_GA_VERSION)" /> > > > > diff --git a/qga/meson.build b/qga/meson.build > index 6d9f39bb321b..3ad3bc0260cf 100644 > --- a/qga/meson.build > +++ b/qga/meson.build > @@ -121,15 +121,14 @@ if targetos =3D=3D 'windows' > output: 'qemu-ga-@0@.msi'.format(host_arch), > depends: deps, > command: [ > - find_program('env'), > - 'QEMU_GA_VERSION=3D' + > config_host['QEMU_GA_VERSION'], > - 'QEMU_GA_MANUFACTURER=3D' + > config_host['QEMU_GA_MANUFACTURER'], > - 'QEMU_GA_DISTRO=3D' + > config_host['QEMU_GA_DISTRO'], > - 'BUILD_DIR=3D' + meson.build_root(), > wixl, '-o', '@OUTPUT0@', '@INPUT0@', > qemu_ga_msi_arch[cpu], > qemu_ga_msi_vss, > + '-D', 'BUILD_DIR=3D' + meson.build_root(), > '-D', 'Mingw_bin=3D' + > config_host['QEMU_GA_MSI_MINGW_BIN_PATH'], > + '-D', 'QEMU_GA_VERSION=3D' + > config_host['QEMU_GA_VERSION'], > + '-D', 'QEMU_GA_MANUFACTURER=3D' + > config_host['QEMU_GA_MANUFACTURER'], > + '-D', 'QEMU_GA_DISTRO=3D' + > config_host['QEMU_GA_DISTRO'], > ]) > all_qga +=3D [qga_msi] > alias_target('msi', qga_msi) > -- > 2.36.0.44.g0f828332d5ac > > --000000000000089d4505de3f7d05 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, May 5= , 2022 at 11:16 AM <marca= ndre.lureau@redhat.com> wrote:
From: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>

No need to setup an environment or to check if the variable is undefined manually.

Signed-off-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
---
=C2=A0qga/installer/qemu-ga.wxs | 30 +++++++++---------------------
=C2=A0qga/meson.build=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 9 +++= +-----
=C2=A02 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 0950e8c6becc..8a19aa165651 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -1,17 +1,5 @@
=C2=A0<?xml version=3D"1.0" encoding=3D"UTF-8"?><= br> =C2=A0<Wix xmlns=3D"http://schemas.microsoft.com/wix= /2006/wi">
-=C2=A0 <?ifndef env.QEMU_GA_VERSION ?>
-=C2=A0 =C2=A0 <?error Environment variable QEMU_GA_VERSION undefined?&g= t;
-=C2=A0 <?endif?>
-
-=C2=A0 <?ifndef env.QEMU_GA_DISTRO ?>
-=C2=A0 =C2=A0 <?error Environment variable QEMU_GA_DISTRO undefined?>= ;
-=C2=A0 <?endif?>
-
-=C2=A0 <?ifndef env.QEMU_GA_MANUFACTURER ?>
-=C2=A0 =C2=A0 <?error Environment variable QEMU_GA_MANUFACTURER undefin= ed?>
-=C2=A0 <?endif?>
-
=C2=A0 =C2=A0<?ifndef var.Arch?>
=C2=A0 =C2=A0 =C2=A0<?error Define Arch to 32 or 64?>
=C2=A0 =C2=A0<?endif?>
@@ -43,20 +31,20 @@
=C2=A0 =C2=A0 =C2=A0Name=3D"QEMU guest agent"
=C2=A0 =C2=A0 =C2=A0Id=3D"*"
=C2=A0 =C2=A0 =C2=A0UpgradeCode=3D"{EB6B8302-C06E-4BEC-ADAC-932C68A3A9= 8D}"
-=C2=A0 =C2=A0 Manufacturer=3D"$(env.QEMU_GA_MANUFACTURER)"
-=C2=A0 =C2=A0 Version=3D"$(env.QEMU_GA_VERSION)"
+=C2=A0 =C2=A0 Manufacturer=3D"$(var.QEMU_GA_MANUFACTURER)"
+=C2=A0 =C2=A0 Version=3D"$(var.QEMU_GA_VERSION)"
=C2=A0 =C2=A0 =C2=A0Language=3D"1033">
=C2=A0 =C2=A0 =C2=A0<?if $(var.Arch) =3D 32 ?>
=C2=A0 =C2=A0 =C2=A0<Condition Message=3D"Error: 32-bit version of = Qemu GA can not be installed on 64-bit Windows.">NOT VersionNT64<= ;/Condition>
=C2=A0 =C2=A0 =C2=A0<?endif?>
=C2=A0 =C2=A0 =C2=A0<Package
-=C2=A0 =C2=A0 =C2=A0 Manufacturer=3D"$(env.QEMU_GA_MANUFACTURER)"= ;
+=C2=A0 =C2=A0 =C2=A0 Manufacturer=3D"$(var.QEMU_GA_MANUFACTURER)"= ;
=C2=A0 =C2=A0 =C2=A0 =C2=A0InstallerVersion=3D"200"
=C2=A0 =C2=A0 =C2=A0 =C2=A0Languages=3D"1033"
=C2=A0 =C2=A0 =C2=A0 =C2=A0Compressed=3D"yes"
=C2=A0 =C2=A0 =C2=A0 =C2=A0InstallScope=3D"perMachine"
=C2=A0 =C2=A0 =C2=A0 =C2=A0/>
-=C2=A0 =C2=A0 <Media Id=3D"1" Cabinet=3D"qemu_ga.$(env.Q= EMU_GA_VERSION).cab" EmbedCab=3D"yes" />
+=C2=A0 =C2=A0 <Media Id=3D"1" Cabinet=3D"qemu_ga.$(var.Q= EMU_GA_VERSION).cab" EmbedCab=3D"yes" />
=C2=A0 =C2=A0 =C2=A0<Property Id=3D"WHSLogo">1</Property= >
=C2=A0 =C2=A0 =C2=A0<MajorUpgrade
=C2=A0 =C2=A0 =C2=A0 =C2=A0DowngradeErrorMessage=3D"Error: A newer ver= sion of QEMU guest agent is already installed."
@@ -66,7 +54,7 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0<Directory Id=3D"$(var.GaProgramFilesFol= der)" Name=3D"QEMU Guest Agent">
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<Directory Id=3D"qemu_ga_director= y" Name=3D"Qemu-ga">
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<Component Id=3D"qemu_ga&q= uot; Guid=3D"{908B7199-DE2A-4DC6-A8D0-27A5AE444FEA}">
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <File Id=3D"qemu_ga.exe&= quot; Name=3D"qemu-ga.exe" Source=3D"$(env.BUILD_DIR)/qga/qe= mu-ga.exe" KeyPath=3D"yes" DiskId=3D"1"/>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <File Id=3D"qemu_ga.exe&= quot; Name=3D"qemu-ga.exe" Source=3D"$(var.BUILD_DIR)/qga/qe= mu-ga.exe" KeyPath=3D"yes" DiskId=3D"1"/>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<ServiceInstall
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Id=3D"ServiceIn= staller"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Type=3D"ownProc= ess"
@@ -88,10 +76,10 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<File Id=3D"libstdc= ++-6.lib" Name=3D"libstdc++-6.dll" Source=3D"$(var.Ming= w_bin)/libstdc++-6.dll" KeyPath=3D"yes" DiskId=3D"1&quo= t;/>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</Component>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<Component Id=3D"qga_vss_d= ll" Guid=3D"{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}">
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <File Id=3D"qga_vss.dll&= quot; Name=3D"qga-vss.dll" Source=3D"$(env.BUILD_DIR)/qga/vs= s-win32/qga-vss.dll" KeyPath=3D"yes" DiskId=3D"1"/= >
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <File Id=3D"qga_vss.dll&= quot; Name=3D"qga-vss.dll" Source=3D"$(var.BUILD_DIR)/qga/vs= s-win32/qga-vss.dll" KeyPath=3D"yes" DiskId=3D"1"/= >
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</Component>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<Component Id=3D"qga_vss_t= lb" Guid=3D"{D8D584B1-59C2-4FB7-A91F-636FF7BFA66E}">
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <File Id=3D"qga_vss.tlb&= quot; Name=3D"qga-vss.tlb" Source=3D"$(env.BUILD_DIR)/qga/vs= s-win32/qga-vss.tlb" KeyPath=3D"yes" DiskId=3D"1"/= >
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <File Id=3D"qga_vss.tlb&= quot; Name=3D"qga-vss.tlb" Source=3D"$(var.BUILD_DIR)/qga/vs= s-win32/qga-vss.tlb" KeyPath=3D"yes" DiskId=3D"1"/= >
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</Component>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<?endif?>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<?if $(var.Arch) =3D "32&q= uot;?>
@@ -133,9 +121,9 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</Component>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<Component Id=3D"registry_= entries" Guid=3D"{D075D109-51CA-11E3-9F8B-000C29858960}">=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<RegistryKey Root=3D&quo= t;HKLM"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0Key=3D"Software\$(env.QEMU_GA_MANUFACTURER)\$(env.QEM= U_GA_DISTRO)\Tools\QemuGA">
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0Key=3D"Software\$(var.QEMU_GA_MANUFACTURER)\$(var.QEM= U_GA_DISTRO)\Tools\QemuGA">
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<RegistryValue Ty= pe=3D"string" Name=3D"ProductID" Value=3D"fb0a0d66= -c7fb-4e2e-a16b-c4a3bfe8d13b" />
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <RegistryValue Type=3D= "string" Name=3D"Version" Value=3D"$(env.QEMU_GA_V= ERSION)" />
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <RegistryValue Type=3D= "string" Name=3D"Version" Value=3D"$(var.QEMU_GA_V= ERSION)" />
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</RegistryKey>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</Component>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</Directory>
diff --git a/qga/meson.build b/qga/meson.build
index 6d9f39bb321b..3ad3bc0260cf 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -121,15 +121,14 @@ if targetos =3D=3D 'windows'
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0output: 'qemu-ga-@0@.msi'.format(hos= t_arch),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0depends: deps,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0command: [
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 find_program('env'),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'QEMU_GA_VERSION=3D' + config_host[= 'QEMU_GA_VERSION'],
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'QEMU_GA_MANUFACTURER=3D' + config_= host['QEMU_GA_MANUFACTURER'],
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'QEMU_GA_DISTRO=3D' + config_host[&= #39;QEMU_GA_DISTRO'],
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'BUILD_DIR=3D' + meson.build_root()= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0wixl, '-o', '@OUTPUT0@= 9;, '@INPUT0@',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qemu_ga_msi_arch[cpu],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qemu_ga_msi_vss,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '-D', 'BUILD_DIR=3D' + meso= n.build_root(),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'-D', 'Mingw_bin=3D' = + config_host['QEMU_GA_MSI_MINGW_BIN_PATH'],
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '-D', 'QEMU_GA_VERSION=3D' = + config_host['QEMU_GA_VERSION'],
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '-D', 'QEMU_GA_MANUFACTURER=3D&= #39; + config_host['QEMU_GA_MANUFACTURER'],
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '-D', 'QEMU_GA_DISTRO=3D' += config_host['QEMU_GA_DISTRO'],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0])
=C2=A0 =C2=A0 =C2=A0all_qga +=3D [qga_msi]
=C2=A0 =C2=A0 =C2=A0alias_target('msi', qga_msi)
--
2.36.0.44.g0f828332d5ac

--000000000000089d4505de3f7d05--