From patchwork Wed Jun 30 15:39:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 108855 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5UFe7RQ021034 for ; Wed, 30 Jun 2010 15:40:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751909Ab0F3PkE (ORCPT ); Wed, 30 Jun 2010 11:40:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18712 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311Ab0F3PkB (ORCPT ); Wed, 30 Jun 2010 11:40:01 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5UFe0HH007717 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 Jun 2010 11:40:00 -0400 Received: from localhost.localdomain (vpn-10-105.rdu.redhat.com [10.11.10.105]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5UFdwj6018145; Wed, 30 Jun 2010 11:39:58 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Disable HPET on windows timedrift tests Date: Wed, 30 Jun 2010 12:39:55 -0300 Message-Id: <1277912395-10671-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 30 Jun 2010 15:40:07 +0000 (UTC) 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)"