Merge autotest upstream from @5318 ~ @5336

client/virt/tests/guest_s4.py

Index: client/virt/tests/guest_s4.py
diff --git a/client/tests/kvm/tests/guest_s4.py b/client/virt/tests/guest_s4.py
similarity index 95%
rename from client/tests/kvm/tests/guest_s4.py
rename to client/virt/tests/guest_s4.py
index efd8e3bf9a8d4d23d77fe812e96aa5284cc75c1f..5b5708d33ca344c073180178943615a0529894f1 100644
--- a/client/tests/kvm/tests/guest_s4.py
+++ b/client/virt/tests/guest_s4.py
@@ -1,6 +1,6 @@
 import logging, time
 from autotest_lib.client.common_lib import error
-import kvm_utils
+from autotest_lib.client.virt import virt_utils
 
 
 @error.context_aware
@@ -49,7 +49,7 @@ def run_guest_s4(test, params, env):
     # Make sure the VM goes down
     error.base_context("after S4")
     suspend_timeout = 240 + int(params.get("smp")) * 60
-    if not kvm_utils.wait_for(vm.is_dead, suspend_timeout, 2, 2):
+    if not virt_utils.wait_for(vm.is_dead, suspend_timeout, 2, 2):
         raise error.TestFail("VM refuses to go down. Suspend failed.")
     logging.info("VM suspended successfully. Sleeping for a while before "
                  "resuming it.")