Merge pull request #251 from xutian/fix_vhost

remove vhost variants from cfg

generic/tests/cfg/file_transfer.cfg

@@ -11,7 +11,7 @@
         - vhost_force:
             only virtio_net
             nettype = bridge
-            vhost = "vhost=on"
+            vhost_fix = "vhost=on"
             variants:
                 - @force_default:
                     #vhost=on only has effect for virtio guests which use MSIX
@@ -19,7 +19,7 @@
                 - vhostforce_on:
                     #For non-MSIX guests or guest disable pci msi,
                     #using vhostforce=on, force enable vhost.
-                    vhostforce = on
+                    vhostforce_fix = on
                     variants:
                         - @default_msi_setting:
                             only Windows

generic/tests/cfg/macvtap_mac_change.cfg

@@ -4,11 +4,6 @@
     shutdown_int = no
     nettype = macvtap
     no Win2003, WinXP, Win2000, WinVista
-    variants:
-        - vhost_on_option:
-            vhost = on
-        - vhost_off_option:
-            vhost = off
     variants:
         - ctrl_mac_addr_on_option:
             ctrl_mac_addr = on
@@ -21,4 +16,3 @@
         ctrl_mac_addr =
     virtio_net:
         no RHEL.5, RHEL.6.0, RHEL.6.1, RHEL.6.2, RHEL.6.3
-

qemu/tests/cfg/flow_caches_stress_test.cfg

@@ -16,11 +16,6 @@
     compile_option_server = --enable-burst
     compile_option_client = --enable-burst
     #test_protocols = TCP_STREAM
-    variants:
-        - vhost_on:
-            vhost=on
-        - vhost_off:
-            vhost=off
     variants:
         - multi_queues:
             no Windows

qemu/tests/cfg/remove_interface_from_host.cfg

@@ -2,9 +2,3 @@
     type = remove_interface_from_host
     #rtl8139 or e1000, do not test vhost=on
     #for virtio-net, test both vhost=on and off
-    variants:
-        - vhost_on:
-            no rtl8139, e1000
-            vhost = "vhost=on"
-        - vhost_off:
-            vhost = "vhost=off"