| Message ID | 1440627694-25096-2-git-send-email-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 27, 2015 at 12:21 AM, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > MSI probe assumes that qemu-ga support has been probed already, but in > cases where --enable-guest-agent/--disable-guest-agent have not been > passed to configure, qemu-ga support may end up getting enabled later, > as is the case with w32 builds. This leads to MSI probe prematurely > reporting error due to lack of qemu-ga support. > > Fix this by moving MSI installer probe after the final qga probes. > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > configure | 106 ++++++++++++++++++++++++++++++++------------------------------ > 1 file changed, 54 insertions(+), 52 deletions(-) > > diff --git a/configure b/configure > index 86a38fe..02d5831 100755 > --- a/configure > +++ b/configure > @@ -3905,58 +3905,6 @@ EOF > fi > > ########################################## > -# Guest agent Window MSI package > - > -if test "$guest_agent" != yes; then > - if test "$guest_agent_msi" = yes; then > - error_exit "MSI guest agent package requires guest agent enabled" > - fi > - guest_agent_msi=no > -elif test "$mingw32" != "yes"; then > - if test "$guest_agent_msi" = "yes"; then > - error_exit "MSI guest agent package is available only for MinGW Windows cross-compilation" > - fi > - guest_agent_msi=no > -elif ! has wixl; then > - if test "$guest_agent_msi" = "yes"; then > - error_exit "MSI guest agent package requires wixl tool installed ( usually from msitools package )" > - fi > - guest_agent_msi=no > -fi > - > -if test "$guest_agent_msi" != "no"; then > - if test "$guest_agent_with_vss" = "yes"; then > - QEMU_GA_MSI_WITH_VSS="-D InstallVss" > - fi > - > - 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 > - > - QEMU_GA_MSI_MINGW_DLL_PATH="-D Mingw_dlls=`$pkg_config --variable=prefix glib-2.0`/bin" > - > - case "$cpu" in > - x86_64) > - QEMU_GA_MSI_ARCH="-a x64 -D Arch=64" > - ;; > - i386) > - QEMU_GA_MSI_ARCH="-D Arch=32" > - ;; > - *) > - error_exit "CPU $cpu not supported for building installation package" > - ;; > - esac > -fi > - > -########################################## > # check if we have fdatasync > > fdatasync=no > @@ -4396,6 +4344,9 @@ if test "$softmmu" = yes ; then > fi > fi > fi > + > +# Probe for guest agent support/options > + > if [ "$guest_agent" != "no" ]; then > if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then > tools="qemu-ga\$(EXESUF) $tools" > @@ -4410,6 +4361,57 @@ if [ "$guest_agent" != "no" ]; then > fi > fi > > +# Guest agent Window MSI package > + > +if test "$guest_agent" != yes; then > + if test "$guest_agent_msi" = yes; then > + error_exit "MSI guest agent package requires guest agent enabled" > + fi > + guest_agent_msi=no > +elif test "$mingw32" != "yes"; then > + if test "$guest_agent_msi" = "yes"; then > + error_exit "MSI guest agent package is available only for MinGW Windows cross-compilation" > + fi > + guest_agent_msi=no > +elif ! has wixl; then > + if test "$guest_agent_msi" = "yes"; then > + error_exit "MSI guest agent package requires wixl tool installed ( usually from msitools package )" > + fi > + guest_agent_msi=no > +fi > + > +if test "$guest_agent_msi" != "no"; then > + if test "$guest_agent_with_vss" = "yes"; then > + QEMU_GA_MSI_WITH_VSS="-D InstallVss" > + fi > + > + 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 > + > + QEMU_GA_MSI_MINGW_DLL_PATH="-D Mingw_dlls=`$pkg_config --variable=prefix glib-2.0`/bin" > + > + case "$cpu" in > + x86_64) > + QEMU_GA_MSI_ARCH="-a x64 -D Arch=64" > + ;; > + i386) > + QEMU_GA_MSI_ARCH="-D Arch=32" > + ;; > + *) > + error_exit "CPU $cpu not supported for building installation package" > + ;; > + esac > +fi > + > # Mac OS X ships with a broken assembler > roms= > if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ > -- > 1.9.1 > >
diff --git a/configure b/configure index 86a38fe..02d5831 100755 --- a/configure +++ b/configure @@ -3905,58 +3905,6 @@ EOF fi ########################################## -# Guest agent Window MSI package - -if test "$guest_agent" != yes; then - if test "$guest_agent_msi" = yes; then - error_exit "MSI guest agent package requires guest agent enabled" - fi - guest_agent_msi=no -elif test "$mingw32" != "yes"; then - if test "$guest_agent_msi" = "yes"; then - error_exit "MSI guest agent package is available only for MinGW Windows cross-compilation" - fi - guest_agent_msi=no -elif ! has wixl; then - if test "$guest_agent_msi" = "yes"; then - error_exit "MSI guest agent package requires wixl tool installed ( usually from msitools package )" - fi - guest_agent_msi=no -fi - -if test "$guest_agent_msi" != "no"; then - if test "$guest_agent_with_vss" = "yes"; then - QEMU_GA_MSI_WITH_VSS="-D InstallVss" - fi - - 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 - - QEMU_GA_MSI_MINGW_DLL_PATH="-D Mingw_dlls=`$pkg_config --variable=prefix glib-2.0`/bin" - - case "$cpu" in - x86_64) - QEMU_GA_MSI_ARCH="-a x64 -D Arch=64" - ;; - i386) - QEMU_GA_MSI_ARCH="-D Arch=32" - ;; - *) - error_exit "CPU $cpu not supported for building installation package" - ;; - esac -fi - -########################################## # check if we have fdatasync fdatasync=no @@ -4396,6 +4344,9 @@ if test "$softmmu" = yes ; then fi fi fi + +# Probe for guest agent support/options + if [ "$guest_agent" != "no" ]; then if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then tools="qemu-ga\$(EXESUF) $tools" @@ -4410,6 +4361,57 @@ if [ "$guest_agent" != "no" ]; then fi fi +# Guest agent Window MSI package + +if test "$guest_agent" != yes; then + if test "$guest_agent_msi" = yes; then + error_exit "MSI guest agent package requires guest agent enabled" + fi + guest_agent_msi=no +elif test "$mingw32" != "yes"; then + if test "$guest_agent_msi" = "yes"; then + error_exit "MSI guest agent package is available only for MinGW Windows cross-compilation" + fi + guest_agent_msi=no +elif ! has wixl; then + if test "$guest_agent_msi" = "yes"; then + error_exit "MSI guest agent package requires wixl tool installed ( usually from msitools package )" + fi + guest_agent_msi=no +fi + +if test "$guest_agent_msi" != "no"; then + if test "$guest_agent_with_vss" = "yes"; then + QEMU_GA_MSI_WITH_VSS="-D InstallVss" + fi + + 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 + + QEMU_GA_MSI_MINGW_DLL_PATH="-D Mingw_dlls=`$pkg_config --variable=prefix glib-2.0`/bin" + + case "$cpu" in + x86_64) + QEMU_GA_MSI_ARCH="-a x64 -D Arch=64" + ;; + i386) + QEMU_GA_MSI_ARCH="-D Arch=32" + ;; + *) + error_exit "CPU $cpu not supported for building installation package" + ;; + esac +fi + # Mac OS X ships with a broken assembler roms= if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
MSI probe assumes that qemu-ga support has been probed already, but in cases where --enable-guest-agent/--disable-guest-agent have not been passed to configure, qemu-ga support may end up getting enabled later, as is the case with w32 builds. This leads to MSI probe prematurely reporting error due to lack of qemu-ga support. Fix this by moving MSI installer probe after the final qga probes. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- configure | 106 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 54 insertions(+), 52 deletions(-)