Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/tests/timedrift_with_migration.py

Index: client/tests/kvm/tests/timedrift_with_migration.py
diff --git a/client/tests/kvm/tests/timedrift_with_migration.py b/client/tests/kvm/tests/timedrift_with_migration.py
index b1d4f3e29315bc039fc1bbba883e95a064cb5671..eb4cb4a1156fb357ff94b7117dc2743018b72cc1 100644
--- a/client/tests/kvm/tests/timedrift_with_migration.py
+++ b/client/tests/kvm/tests/timedrift_with_migration.py
@@ -1,6 +1,6 @@
 import logging
 from autotest_lib.client.common_lib import error
-import kvm_test_utils
+from autotest_lib.client.virt import virt_test_utils
 
 
 def run_timedrift_with_migration(test, params, env):
@@ -36,13 +36,13 @@ def run_timedrift_with_migration(test, params, env):
     try:
         # Get initial time
         # (ht stands for host time, gt stands for guest time)
-        (ht0, gt0) = kvm_test_utils.get_time(session, time_command,
+        (ht0, gt0) = virt_test_utils.get_time(session, time_command,
                                              time_filter_re, time_format)
 
         # Migrate
         for i in range(migration_iterations):
             # Get time before current iteration
-            (ht0_, gt0_) = kvm_test_utils.get_time(session, time_command,
+            (ht0_, gt0_) = virt_test_utils.get_time(session, time_command,
                                                    time_filter_re, time_format)
             session.close()
             # Run current iteration
@@ -54,7 +54,7 @@ def run_timedrift_with_migration(test, params, env):
             session = vm.wait_for_login(timeout=30)
             logging.info("Logged in after migration")
             # Get time after current iteration
-            (ht1_, gt1_) = kvm_test_utils.get_time(session, time_command,
+            (ht1_, gt1_) = virt_test_utils.get_time(session, time_command,
                                                    time_filter_re, time_format)
             # Report iteration results
             host_delta = ht1_ - ht0_
@@ -72,7 +72,7 @@ def run_timedrift_with_migration(test, params, env):
                                      "%.2f seconds" % (i + 1, drift))
 
         # Get final time
-        (ht1, gt1) = kvm_test_utils.get_time(session, time_command,
+        (ht1, gt1) = virt_test_utils.get_time(session, time_command,
                                              time_filter_re, time_format)
 
     finally: