From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 20 Jul 2011 10:45:02 +0000 (+0100)
Subject: Partially revert d82438431c1551610eb7d9945fa76d6387534582.
X-Git-Tag: 1.10.6~13
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a97dd1d9d21bf10f276ce87509eb7469c0fa104a;p=libguestfs.git

Partially revert d82438431c1551610eb7d9945fa76d6387534582.

It appears qemu-kvm does *not* require -machine accel=tcg option.
That problem disappeared after upgrading seabios(!)  However leave the
test for qemu -help option, since that's useful to determine if qemu
is completely broken or not.
(cherry picked from commit 5dec7842655dd872bb0fd9fe07f6a9eab6b13bfd)
---

diff --git a/configure.ac b/configure.ac
index 536dac0..aadbe9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,18 +323,8 @@ working.
 ])
     fi
 
-    # qemu since 0.15 requires the -machine accel=tcg option, otherwise
-    # it won't start up.  QEMU DEVELOPERS, PLEASE ADD CAPABILITIES TESTING.
-    AC_MSG_CHECKING([if this qemu has the -machine accel=tcg option])
-    if $QEMU -help 2>&1 | grep -sq -- '-machine.*accel.*tcg'; then
-        qemu_machine_accel_tcg="-machine accel=tcg"
-        AC_MSG_RESULT([$qemu_machine_accel_tcg])
-    else
-        AC_MSG_RESULT([no])
-    fi
-
     AC_MSG_CHECKING([for virtio-serial support in $QEMU])
-    if $QEMU $qemu_machine_accel_tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
+    if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
         AC_MSG_RESULT([yes])
     else
         AC_MSG_RESULT([no])