From patchwork Tue Aug 26 18:29:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris J Arges X-Patchwork-Id: 4783601 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 980BE9F2E8 for ; Tue, 26 Aug 2014 18:29:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDB0420154 for ; Tue, 26 Aug 2014 18:29:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A0FB20131 for ; Tue, 26 Aug 2014 18:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752804AbaHZS3c (ORCPT ); Tue, 26 Aug 2014 14:29:32 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:38573 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752415AbaHZS3b (ORCPT ); Tue, 26 Aug 2014 14:29:31 -0400 Received: from cpe-173-174-67-34.austin.res.rr.com ([173.174.67.34] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XMLUo-0002hZ-Ia; Tue, 26 Aug 2014 18:29:30 +0000 From: Chris J Arges To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, Chris J Arges Subject: [PATCH 2/2] x86/unittests.cfg: the pmu testcase requires that nmi_watchdog is disabled Date: Tue, 26 Aug 2014 13:29:14 -0500 Message-Id: <1409077754-4163-3-git-send-email-chris.j.arges@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409077754-4163-1-git-send-email-chris.j.arges@canonical.com> References: <1409077754-4163-1-git-send-email-chris.j.arges@canonical.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If nmi_watchdog is enabled, it will take up a PMU counter causing the all_counters testcase to fail. This additional check will error out if nmi_watchdog is enabled and provide feedback for the user to configure the host machine correctly. Signed-off-by: Chris J Arges Reviewed-by: Paolo Bonzini --- x86/unittests.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/x86/unittests.cfg b/x86/unittests.cfg index 0123944..badb08a 100644 --- a/x86/unittests.cfg +++ b/x86/unittests.cfg @@ -92,6 +92,7 @@ file = msr.flat [pmu] file = pmu.flat extra_params = -cpu host +check = /proc/sys/kernel/nmi_watchdog=0 [port80] file = port80.flat