From: Juan Quintela <[email protected]>

Signed-off-by: Juan Quintela <[email protected]>
Signed-off-by: Marcelo Tosatti <[email protected]>

diff --git a/configure b/configure
index 65ec0ae..f5493e3 100755
--- a/configure
+++ b/configure
@@ -229,7 +229,7 @@ io_thread="no"
 mixemu="no"
 kvm_trace="no"
 kvm_cap_pit=""
-kvm_cap_device_assignment="no"
+kvm_cap_device_assignment=""
 kerneldir=""
 aix="no"
 blobs="yes"
@@ -498,6 +498,10 @@ for opt do
   ;;
   --enable-kvm-cap-pit) kvm_cap_pit="yes"
   ;;
+  --disable-kvm-cap-device-assignment) kvm_cap_device_assignment="no"
+  ;;
+  --enable-kvm-cap-device-assignment) kvm_cap_device_assignment="yes"
+  ;;
   --enable-profiler) profiler="yes"
   ;;
   --enable-cocoa)
@@ -706,6 +710,8 @@ echo "  --disable-kvm            disable KVM acceleration 
support"
 echo "  --enable-kvm             enable KVM acceleration support"
 echo "  --disable-cap-kvm-pit    disable KVM pit support"
 echo "  --enable-cap-kvm-pit     enable KVM pit support"
+echo "  --disable-cap-device-assigmment    disable KVM device assignemnt"
+echo "  --enable-cap-device-assigmment     enable KVM device assignemnt"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-nptl            disable usermode NPTL support"
 echo "  --enable-system          enable all system emulation targets"
@@ -1387,7 +1393,11 @@ fi
 
 ##########################################
 # test for KVM_CAP_DEVICE_ASSIGNMENT
-if test "$kvm" != "no" ; then
+
+if test "$kvm_cap_device_assignment" != "no" ; then
+  if test "$kvm" = "no" -a "$kvm_cap_device_assignment" = "yes" ; then
+      feature_not_found "kvm_cap_device_assignment (kvm is not enabled)"
+  fi
   cat > $TMPC <<EOF
 #include <linux/kvm.h>
 #ifndef KVM_CAP_DEVICE_ASSIGNMENT
@@ -1397,6 +1407,11 @@ int main(void) { return 0; }
 EOF
   if compile_prog $kvm_cflags "" ; then
     kvm_cap_device_assignment=yes
+  else
+    if test "$kvm_cap_device_assignment" = "yes" ; then
+      feature_not_found "kvm_cap_device_assigment"
+    fi
+    kvm_cap_device_assignment=no
   fi
 fi
 
@@ -1869,6 +1884,7 @@ echo "Linux AIO support $linux_aio"
 echo "Install blobs     $blobs"
 echo "KVM support       $kvm"
 echo "KVM PIT support   $kvm_cap_pit"
+echo "KVM device assig. $kvm_cap_device_assignment"
 echo "KVM trace support $kvm_trace"
 echo "fdt support       $fdt"
 echo "preadv support    $preadv"
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to