Merge pull request #131 from FengYang/vm_arch_name

qemu.tests: Update netperf_stress config in suspend_under_netperf test case.

qemu/tests/cfg/suspend_under_netperf.cfg

@@ -5,19 +5,26 @@
     services_up_timeout = 30
     kill_vm_on_error = yes
     variants:
-        - netperf_stress:
+        - suspend_netperf_stress:
             #netperf server is main vm, the netperf client is the host or another vm
             wait_bg_time = 60
             run_bgstress = netperf_stress
             bg_stress_run_flag = netperf_run
-            hostpasswd = redhat
-            netperf_download_link = ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2
-            server_path = /tmp/netperf-2.6.0.tar.bz2
-            client_path = /tmp/netperf-2.6.0.tar.bz2
-            pkg_md5sum = 9654ffdfd4c4f2c93ce3733cd9ed9236
+            hostpassword = redhat
+            netperf_client = ${vms}
+            netperf_server = localhost
+            netperf_link = netperf-2.6.0.tar.bz2
+            server_path = /var/tmp/
+            client_path = /var/tmp/
             netperf_test_timeout = 360
             netperf_para_sessions = 6
             test_protocol = TCP_STREAM
+            Windows:
+                netperf_server_link_win = "netserver-2.6.0.exe"
+                netperf_client_link_win = "netperf.exe"
+                server_path_win = "c:\\"
+                client_path_win = "c:\\"
+
 
     variants:
         - guest_s3:

qemu/tests/suspend_under_stress.py

@@ -45,7 +45,7 @@ def run(test, params, env):
         suspend_type = params.get("guest_suspend_type")
         error.context("Run suspend '%s' test under stress" % suspend_type,
                       logging.info)
-        bg_cmd = guest_suspend.run_guest_suspend
+        bg_cmd = guest_suspend.run
         args = (test, params, env)
         bg = utils_test.BackgroundTest(bg_cmd, args)
         bg.start()