Merge autotest upstream from @5318 ~ @5336

client/virt/tests/file_transfer.py

Index: client/virt/tests/file_transfer.py
diff --git a/client/tests/kvm/tests/file_transfer.py b/client/virt/tests/file_transfer.py
similarity index 94%
rename from client/tests/kvm/tests/file_transfer.py
rename to client/virt/tests/file_transfer.py
index 61982a63473c5919781d7df762f3b17e57b644bd..5f6672d3cbf8d29289d64a3440d52aaec3a913cd 100644
--- a/client/tests/kvm/tests/file_transfer.py
+++ b/client/virt/tests/file_transfer.py
@@ -1,7 +1,8 @@
 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_file_transfer(test, params, env):
     """
@@ -34,11 +35,11 @@ def run_file_transfer(test, params, env):
         count = 1
 
     host_path = os.path.join(dir_name, "tmp-%s" %
-                             kvm_utils.generate_random_string(8))
+                             virt_utils.generate_random_string(8))
     host_path2 = host_path + ".2"
     cmd = "dd if=/dev/zero of=%s bs=10M count=%d" % (host_path, count)
     guest_path = (tmp_dir + "file_transfer-%s" %
-                  kvm_utils.generate_random_string(8))
+                  virt_utils.generate_random_string(8))
 
     try:
         logging.info("Creating %dMB file on host", filesize)