Merge autotest upstream from @5318 ~ @5336

client/virt/tests/kdump.py

Index: client/virt/tests/kdump.py
diff --git a/client/tests/kvm/tests/kdump.py b/client/virt/tests/kdump.py
similarity index 95%
rename from client/tests/kvm/tests/kdump.py
rename to client/virt/tests/kdump.py
index c847131b29a0f23afd43447c50dc1707ebf4e1c4..90c004bce79a32a7e31215515a320afa1780f4c5 100644
--- a/client/tests/kvm/tests/kdump.py
+++ b/client/virt/tests/kdump.py
@@ -1,6 +1,6 @@
 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):
@@ -41,7 +41,7 @@ def run_kdump(test, params, env):
         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)