From: Marc-André Lureau <[email protected]> The variable doesn't have much use, and is not easily discoverable (from configure time option, or as installed registry value).
Eventually, QEMU_GA_MANUFACTURER customization could cover the need for a specialized registry key or directory path, but as in its current form, they don't really help. Signed-off-by: Marc-André Lureau <[email protected]> --- configure | 5 ----- qga/installer/qemu-ga.wxs | 6 +----- qga/meson.build | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure b/configure index 321e66809234..3fd2c91e0d76 100755 --- a/configure +++ b/configure @@ -2694,10 +2694,6 @@ fi # Guest agent Windows MSI package -if test "$QEMU_GA_DISTRO" = ""; then - QEMU_GA_DISTRO=Linux -fi - # Mac OS X ships with a broken assembler roms= if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ @@ -2784,7 +2780,6 @@ if test "$debug_tcg" = "yes" ; then fi if test "$mingw32" = "yes" ; then echo "CONFIG_WIN32=y" >> $config_host_mak - echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak else echo "CONFIG_POSIX=y" >> $config_host_mak fi diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 2c49a2336e11..768bc35d1159 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -4,10 +4,6 @@ <?error Variable QEMU_GA_VERSION undefined ?> <?endif?> - <?ifndef env.QEMU_GA_DISTRO ?> - <?error Environment variable QEMU_GA_DISTRO undefined?> - <?endif?> - <?define QEMU_GA_MANUFACTURER = "QEMU" ?> <?ifndef var.Arch?> @@ -131,7 +127,7 @@ </Component> <Component Id="registry_entries" Guid="{D075D109-51CA-11E3-9F8B-000C29858960}"> <RegistryKey Root="HKLM" - Key="Software\$(var.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\QemuGA"> + Key="Software\$(var.QEMU_GA_MANUFACTURER)\Tools\QemuGA"> <RegistryValue Type="string" Name="ProductID" Value="fb0a0d66-c7fb-4e2e-a16b-c4a3bfe8d13b" /> <RegistryValue Type="string" Name="Version" Value="$(var.QEMU_GA_VERSION)" /> </RegistryKey> diff --git a/qga/meson.build b/qga/meson.build index fb437062612e..40a7baabfde3 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -122,7 +122,6 @@ if targetos == 'windows' depends: deps, command: [ find_program('env'), - 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'], 'BUILD_DIR=' + meson.build_root(), wixl, '-o', '@OUTPUT0@', '@INPUT0@', qemu_ga_msi_arch[cpu], -- 2.35.1.693.g805e0a68082a
