[Pkg-libvirt-commits] [libguestfs] 29/66: configure: Fix tests of qemu on ARM.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit e3d1e1a751e1fea88f114178e56b7396b18cc46c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Apr 15 18:03:53 2014 -0400

    configure: Fix tests of qemu on ARM.
    
    qemu-system-arm now requires that you pass '-machine virt' (or some
    -machine type) explicitly.
    
    Change the configure test so it works on upstream ARM.
    
    (cherry picked from commit 3c260f23d4a4256e892955d38116c91e7bd189af)
---
 configure.ac | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 01c5e0f..d35f721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,16 +783,29 @@ working.
             AC_MSG_FAILURE([$QEMU version must be >= 1.0.])
         fi
 
-        AC_MSG_CHECKING([that $QEMU -display none -machine accel=kvm:tcg -device ? works])
-        if $QEMU -display none -machine accel=kvm:tcg -device \? >&AS_MESSAGE_LOG_FD 2>&1; then
+	dnl Unfortunately $QEMU -device \? won't just work.  We probably
+	dnl need to add a cocktail of different arguments which differ
+	dnl on the various emulators.  Thanks, qemu.
+	AC_MSG_CHECKING([what extra options we need to use for qemu feature tests])
+	QEMU_OPTIONS_FOR_CONFIGURE=
+	# Note: the order we test these matters.
+	for opt in "-machine virt" "-machine accel=kvm:tcg" "-display none"; do
+	    if $QEMU $QEMU_OPTIONS_FOR_CONFIGURE $opt -device \? >&AS_MESSAGE_LOG_FD 2>&1; then
+	        QEMU_OPTIONS_FOR_CONFIGURE="$QEMU_OPTIONS_FOR_CONFIGURE $opt"
+	    fi
+	done
+	AC_MSG_RESULT([$QEMU_OPTIONS_FOR_CONFIGURE])
+
+        AC_MSG_CHECKING([that $QEMU $QEMU_OPTIONS_FOR_CONFIGURE -device ? works])
+        if $QEMU $QEMU_OPTIONS_FOR_CONFIGURE -device \? >&AS_MESSAGE_LOG_FD 2>&1; then
             AC_MSG_RESULT([yes])
         else
             AC_MSG_RESULT([no])
-            AC_MSG_FAILURE([$QEMU -display none -machine accel=kvm:tcg -device ? doesn't work.])
+            AC_MSG_FAILURE([$QEMU $QEMU_OPTIONS_FOR_CONFIGURE -device ? doesn't work.])
         fi
 
         AC_MSG_CHECKING([for virtio-serial support in $QEMU])
-        if $QEMU $QEMU_OPTIONS -display none -machine accel=kvm:tcg -device \? 2>&1 | grep -sq virtio-serial; then
+        if $QEMU $QEMU_OPTIONS_FOR_CONFIGURE -device \? 2>&1 | grep -sq virtio-serial; then
             AC_MSG_RESULT([yes])
         else
             AC_MSG_RESULT([no])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git