Merge pull request #130 from spcui/sr_iov

sr-iov bugs fix

qemu/tests/cfg/sr_iov.cfg

@@ -57,6 +57,7 @@
             repeat_times = 500
             test_timeout = 10000
         - vf_guest_suspend:
+            no Host_RHEL.6
             variants:
                 - vf_assigned:
                     type = guest_suspend
@@ -87,9 +88,9 @@
             variants:
                 - vf_iommu_off:
                     start_vm = no
-                    negative_msg = "\'pci-assign\' could not be initialized"
+                    negative_msg = "'pci-assign' could not be initialized"
                     pci-assign_params = iommu
-                    iommu = 0
+                    iommu = off
                     type = sr_iov_boot_negative
                 - no-kvm:
                     pci_assignable = vf
@@ -102,14 +103,14 @@
                     pci_assignable = vf
                     type = sr_iov_hotplug_negative
                     modprobe_cmd = modprobe -r igb
-                    pci_addr = abc
+                    pci_invaild_addr = abc
                     negative_msg = "Property 'pci-assign.addr' doesn't take value 'abc'"
                 - hotplug_iommu_off:
                     pci_assignable = vf
                     type = sr_iov_hotplug_negative
                     negative_msg = "Device 'pci-assign' could not be initialized"
                     hotplug_params = iommu
-                    iommu = 0
+                    iommu = off
                 - more_than_max_vfs:
                     driver_option = "max_vfs=8"
                     type = boot

qemu/tests/sr_iov_hotplug_negative.py

@@ -50,7 +50,7 @@ def run(test, params, env):
     vm.verify_alive()
     rp_times = int(params.get("repeat_times", 1))
     pci_model = params.get("pci_model", "pci-assign")
-    pci_addr = params.get("pci_addr")
+    pci_invaild_addr = params.get("pci_invaild_addr")
     modprobe_cmd = params.get("modprobe_cmd")
 
     if modprobe_cmd:
@@ -80,9 +80,9 @@ def run(test, params, env):
                                                           "device_add")
     for j in range(rp_times):
         if cmd_type == "pci_add":
-            pci_add_cmd = make_pci_add_cmd(pa_pci_ids[0], pci_addr)
+            pci_add_cmd = make_pci_add_cmd(pa_pci_ids[0], pci_invaild_addr)
         elif cmd_type == "device_add":
-            pci_add_cmd = make_device_add_cmd(pa_pci_ids[0], pci_addr)
+            pci_add_cmd = make_device_add_cmd(pa_pci_ids[0], pci_invaild_addr)
         try:
             msg = "Adding pci device with command '%s'" % pci_add_cmd
             error.context(msg, logging.info)