Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/tests/steps.py

Index: client/tests/kvm/tests/steps.py
diff --git a/client/tests/kvm/tests/steps.py b/client/tests/kvm/tests/steps.py
index 3ad0143ab81bee642ff0ae3ee386577f8ba7ba41..e590c00f24ea48219fc54d6f97d48ebd32e9f23a 100644
--- a/client/tests/kvm/tests/steps.py
+++ b/client/tests/kvm/tests/steps.py
@@ -6,7 +6,8 @@ Utilities to perform automatic guest installation using step files.
 
 import os, time, shutil, logging
 from autotest_lib.client.common_lib import error
-import kvm_utils, ppm_utils, kvm_monitor
+from autotest_lib.client.virt import virt_utils, ppm_utils, kvm_monitor
+
 try:
     import PIL.Image
 except ImportError:
@@ -191,7 +192,7 @@ def run_steps(test, params, env):
     steps_filename = params.get("steps")
     if not steps_filename:
         raise error.TestError("Steps filename not specified")
-    steps_filename = kvm_utils.get_path(test.bindir, steps_filename)
+    steps_filename = virt_utils.get_path(test.bindir, steps_filename)
     if not os.path.exists(steps_filename):
         raise error.TestError("Steps file not found: %s" % steps_filename)