Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/tests/vmstop.py

Index: client/tests/kvm/tests/vmstop.py
diff --git a/client/tests/kvm/tests/vmstop.py b/client/tests/kvm/tests/vmstop.py
index 74ecb23c1fcfdc1cc1233fda75d5cef2c37d0bef..441ddb9edd3522a7dfe9722337d236573594ed25 100644
--- a/client/tests/kvm/tests/vmstop.py
+++ b/client/tests/kvm/tests/vmstop.py
@@ -1,7 +1,7 @@
 import logging, time, os
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
-import kvm_utils
+from autotest_lib.client.virt import virt_utils
 
 
 def run_vmstop(test, params, env):
@@ -35,8 +35,8 @@ def run_vmstop(test, params, env):
         utils.run("dd if=/dev/zero of=/tmp/file bs=1M count=%s" % file_size)
         # Transfer file from host to guest, we didn't expect the finish of
         # transfer, we just let it to be a kind of stress in guest.
-        bg = kvm_utils.Thread(vm.copy_files_to, ("/tmp/file", guest_path),
-                              dict(verbose=True, timeout=60))
+        bg = virt_utils.Thread(vm.copy_files_to, ("/tmp/file", guest_path),
+                               dict(verbose=True, timeout=60))
         logging.info("Start the background transfer")
         bg.start()