Merge autotest upstream from @5318 ~ @5336

client/virt/tests/kdump.py

 import logging
 from autotest_lib.client.common_lib import error
-import kvm_utils
+from autotest_lib.client.virt import virt_utils
 
 
 def run_kdump(test, params, env):
     """
     KVM reboot test:
     1) Log into a guest
     2) Check and enable the kdump
     3) For each vcpu, trigger a crash and check the vmcore
 
     @param test: kvm test object
@@ skipping 20 matching lines @@
 
         @param vcpu: vcpu which is used to trigger a crash
         """
         session = vm.wait_for_login(timeout=timeout)
         session.cmd_output("rm -rf /var/crash/*")
 
         logging.info("Triggering crash on vcpu %d ...", vcpu)
         crash_cmd = "taskset -c %d echo c > /proc/sysrq-trigger" % vcpu
         session.sendline(crash_cmd)
 
-        if not kvm_utils.wait_for(lambda: not session.is_responsive(), 240, 0,
+        if not virt_utils.wait_for(lambda: not session.is_responsive(), 240, 0,
                                   1):
             raise error.TestFail("Could not trigger crash on vcpu %d" % vcpu)
 
         logging.info("Waiting for kernel crash dump to complete")
         session = vm.wait_for_login(timeout=crash_timeout)
 
         logging.info("Probing vmcore file...")
         session.cmd("ls -R /var/crash | grep vmcore")
         logging.info("Found vmcore.")
 
@@ skipping 11 matching lines @@
         logging.info("Enabling kdump service...")
         # the initrd may be rebuilt here so we need to wait a little more
         session.cmd(kdump_enable_cmd, timeout=120)
 
         nvcpu = int(params.get("smp", 1))
         for i in range (nvcpu):
             crash_test(i)
 
     finally:
         session.close()