[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/26] configure: qemu-ga: explicitly enable qemu-ga
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 24/26] configure: qemu-ga: explicitly enable qemu-ga MSI support when probed |
Date: |
Tue, 1 Sep 2015 13:39:01 -0500 |
Currently, if we don't explicitly disable support for MSI installer
via --disable-guest-agent-msi, the configure variable that tracks
the flag, 'guest_agent_msi', never gets set unless one of the probes
fails. Subsequent code then treats this unset value the same as if it
were a "yes" value (via != "no" style checks).
Instead, set the default "yes" value explicitly after the probes, then
make subsequent code expect the values to be set.
This makes it easier to report on whether or not MSI support was
enabled via probe by looking at the ./configure summary.
Signed-off-by: Michael Roth <address@hidden>
---
configure | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c31c652..a52ef50 100755
--- a/configure
+++ b/configure
@@ -4378,9 +4378,15 @@ elif ! has wixl; then
error_exit "MSI guest agent package requires wixl tool installed ( usually
from msitools package )"
fi
guest_agent_msi=no
+else
+ # we support qemu-ga, mingw32, and wixl: default to MSI enabled if it wasn't
+ # disabled explicitly
+ if test "$guest_agent_msi" != "no"; then
+ guest_agent_msi=yes
+ fi
fi
-if test "$guest_agent_msi" != "no"; then
+if test "$guest_agent_msi" = "yes"; then
if test "$guest_agent_with_vss" = "yes"; then
QEMU_GA_MSI_WITH_VSS="-D InstallVss"
fi
@@ -4659,7 +4665,7 @@ if test "$mingw32" = "yes" ; then
if test "$guest_agent_ntddscsi" = "yes" ; then
echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak
fi
- if test "$guest_agent_msi" != "no"; then
+ if test "$guest_agent_msi" = "yes"; then
echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak
echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >>
$config_host_mak
echo "QEMU_GA_MSI_WITH_VSS=${QEMU_GA_MSI_WITH_VSS}" >> $config_host_mak
--
1.9.1
- [Qemu-devel] [PATCH 17/26] qga: move agent run in a separate function, (continued)
- [Qemu-devel] [PATCH 17/26] qga: move agent run in a separate function, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 15/26] qga: move option parsing to separate function, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 13/26] qga: rename 'path' to 'channel_path', Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 20/26] qga: add --dump-conf option, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 21/26] qga: start a man page, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 01/26] qemu-ga: Add .msi files to .gitignore, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 22/26] qemu-ga: implement win32 guest-set-user-password, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 14/26] qga: copy argument strings, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 23/26] configure: qemu-ga: move MSI installer probe after qga probe, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 25/26] build: qemu-ga: fix VSS dependencies, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 24/26] configure: qemu-ga: explicitly enable qemu-ga MSI support when probed,
Michael Roth <=
- [Qemu-devel] [PATCH 04/26] qemu-ga: Minor cosmetic changes to the WXS file, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 06/26] qemu-ga: Prevent QEMU-GA VSS provider from being unregistered on MSI reinstall, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 03/26] qemu-ga: Fixed GUID capitalization, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 02/26] qemu-ga: Two MSI related cosmetic changes, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 07/26] qemu-ga: Fixed paths issue with MSI build, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 05/26] qemu-ga: Created a separate component for each installed file in the MSI, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 19/26] qga: add an optional qemu-ga.conf system configuration, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 08/26] configure: qemu-ga: report MSI install support in summary, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 26/26] Makefile: qemu-ga: fix msi target error message, Michael Roth, 2015/09/01
- Re: [Qemu-devel] [PULL v2 00/26] qemu-ga patch queue for 2015-09-01, Peter Maydell, 2015/09/03