KVM test: Disable HPET on windows timedrift tests

Commit Message

Lucas Meneghel Rodrigues June 30, 2010, 3:39 p.m. UTC

None

Patch

diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index ff69aed..4856ebe 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -292,6 +292,12 @@  class VM:
             return (" -chardev file,id=testlog,path=%s"
                     " -device testdev,chardev=testlog" % filename)
 
+        def add_no_hpet(help):
+            if has_option(help, "no-hpet"):
+                return " -no-hpet"
+            else:
+                return ""
+
         # End of command line option wrappers
 
         if name is None: name = self.name
@@ -429,6 +435,9 @@  class VM:
         if params.get("testdev") == "yes":
             qemu_cmd += add_testdev(help, self.get_testlog_filename())
 
+        if params.get("disable_hpet") == "yes":
+            qemu_cmd += add_no_hpet(help)
+
         # If the PCI assignment step went OK, add each one of the PCI assigned
         # devices to the qemu command line.
         if self.pci_assignable:
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index c678898..7f59bfc 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1047,6 +1047,8 @@  variants:
         stress_boot:
             alive_test_cmd = systeminfo
         timedrift:
+            # Timedrift compensation on Windows with hpet does not happen
+            disable_hpet = yes
             extra_params += " -rtc-td-hack"
             time_command = "echo TIME: %date% %time%"
             time_filter_re = "(?<=TIME: \w\w\w ).{19}(?=\.\d\d)"