diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2009-07-21 15:59:35 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2009-07-21 15:59:35 +0100 |
| commit | b2ae7ed6e67b3cf596e1000ec5219bbefb6123dd (patch) | |
| tree | db55d2c8e179630f5f6380966772b004bada1121 | |
| parent | 83458d26fafd027f5c5c18208b4937cbde6e5ad7 (diff) | |
| download | libguestfs-b2ae7ed6e67b3cf596e1000ec5219bbefb6123dd.tar.gz libguestfs-b2ae7ed6e67b3cf596e1000ec5219bbefb6123dd.tar.xz libguestfs-b2ae7ed6e67b3cf596e1000ec5219bbefb6123dd.zip | |
configure: Detect new-style guestfwd support (RHBZ#512957)
However new qemu 0.10.5 still doesn't work.
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 82907714..1bc11093 100644 --- a/configure.ac +++ b/configure.ac @@ -90,12 +90,18 @@ AC_DEFINE_UNQUOTED([QEMU],["$QEMU"],[Location of qemu binary.]) dnl Check that the chosen qemu has vmchannel support. dnl http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html if test "x$vmchannel_test" != "xno"; then - AC_MSG_CHECKING([for vmchannel support in $QEMU]) - vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:` - echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD - if ! echo $vmchannelout | grep -sq "vmchannel wrong port number" ; then - AC_MSG_RESULT([no]) - AC_MSG_FAILURE( + AC_MSG_CHECKING([for "guestfwd" support in $QEMU]) + if qemu-kvm --help | grep -sq guestfwd; then + AC_MSG_RESULT([yes]) + else + AC_MSG_CHECKING([for "-net channel" support in $QEMU]) + vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:` + echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD + if echo $vmchannelout | grep -sq "vmchannel wrong port number" ; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_FAILURE( [I did not find vmchannel support in $QEMU. vmchannel support is vital for libguestfs to operate. You need a version @@ -111,8 +117,8 @@ If I am using the wrong qemu or you want to compile qemu from source and install it in another location, then you should configure with the --with-qemu option. ]) + fi fi - AC_MSG_RESULT([yes]) fi dnl Set drive interface used by the guestfs_add_drive{,_ro} calls |