Merge autotest upstream from @5318 ~ @5336

client/virt/tests/image_copy.py

 import os, logging
 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_image_copy(test, params, env):
     """
     Copy guest images from nfs server.
     1) Mount the NFS share directory
     2) Check the existence of source image
     3) If it exists, copy the image from NFS
 
     @param test: kvm test object
@@ skipping 11 matching lines @@
         raise error.TestError('Failed to create NFS share dir %s' %
                               mount_dest_dir)
 
     src = params.get('images_good')
     image = '%s.%s' % (os.path.split(params['image_name'])[1],
                        params['image_format'])
     src_path = os.path.join(mount_dest_dir, image)
     dst_path = '%s.%s' % (params['image_name'], params['image_format'])
     cmd = 'cp %s %s' % (src_path, dst_path)
 
-    if not kvm_utils.mount(src, mount_dest_dir, 'nfs', 'ro'):
+    if not virt_utils.mount(src, mount_dest_dir, 'nfs', 'ro'):
         raise error.TestError('Could not mount NFS share %s to %s' %
                               (src, mount_dest_dir))
 
     # Check the existence of source image
     if not os.path.exists(src_path):
         raise error.TestError('Could not find %s in NFS share' % src_path)
 
     logging.debug('Copying image %s...', image)
     utils.system(cmd)