Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/tests/migration.py

Index: client/tests/kvm/tests/migration.py
diff --git a/client/tests/kvm/tests/migration.py b/client/tests/kvm/tests/migration.py
index b462e66c78034429623a4cb3c0fbbe30f6c9bd2d..2426f3f2aaa7cff4c4f434ae960a60d1f7f940db 100644
--- a/client/tests/kvm/tests/migration.py
+++ b/client/tests/kvm/tests/migration.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
 
 
 def run_migration(test, params, env):
@@ -68,9 +68,9 @@ def run_migration(test, params, env):
                          "command output after migration")
             logging.info("Command: %s", test_command)
             logging.info("Output before:" +
-                         kvm_utils.format_str_for_message(reference_output))
+                         virt_utils.format_str_for_message(reference_output))
             logging.info("Output after:" +
-                         kvm_utils.format_str_for_message(output))
+                         virt_utils.format_str_for_message(output))
             raise error.TestFail("Command '%s' produced different output "
                                  "before and after migration" % test_command)