[libguestfs/f17] Make virtio unconditional. It's been a very long time since disabling virtio was a good idea. (cher

[Richard W.M. Jones]

commit 25c52ad0b8d59d93e412347d7d92ce7b1a186f4b
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Feb 10 15:01:52 2012 +0000

    Make virtio unconditional.  It's been a very long time since disabling virtio was a good idea.
    (cherry picked from commit 2fef5bf9b3c1046d5093b9fdd52d98427b0982ca)

 libguestfs.spec |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 1c22d06..e585328 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -10,14 +10,6 @@
 %global buildnet 0
 %endif 
 
-# Enable to make the appliance use virtio_blk
-# Default is enabled
-%if %{defined libguestfs_virtio}
-%global with_virtio %{libguestfs_virtio}
-%else
-%global with_virtio 1
-%endif 
-
 # Enable to run tests during check
 # Default is enabled
 %if %{defined libguestfs_runtests}
@@ -679,9 +671,7 @@ cat yum.conf
   --with-extra="fedora=%{fedora},release=%{release}" \
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   --enable-install-daemon \
-%if %{with_virtio}
   --with-drive-if=virtio \
-%endif
   %{extra} || {
     echo "==== config.log ===="
     cat config.log
@@ -1030,8 +1020,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Feb 10 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.5-4
+* Fri Feb 10 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.5-5
 - +BR ruby-irb.
+- Make virtio unconditional.  It's been a very long time since disabling
+  virtio was a good idea.
 
 * Wed Feb  8 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.5-1
 - New upstream version 1.17.5.