From patchwork Fri Apr 21 00:49:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Matlack X-Patchwork-Id: 9691571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C64EA6038D for ; Fri, 21 Apr 2017 00:52:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B662F2847B for ; Fri, 21 Apr 2017 00:52:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AAC572847C; Fri, 21 Apr 2017 00:52:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48D9A223C7 for ; Fri, 21 Apr 2017 00:52:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034157AbdDUAwF (ORCPT ); Thu, 20 Apr 2017 20:52:05 -0400 Received: from mail-io0-f177.google.com ([209.85.223.177]:36184 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S948282AbdDUAuL (ORCPT ); Thu, 20 Apr 2017 20:50:11 -0400 Received: by mail-io0-f177.google.com with SMTP id o22so104064249iod.3 for ; Thu, 20 Apr 2017 17:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tpD1/kggmaCq2UDroZslZ9o0Gp0/4NryyenZsFdN5tg=; b=K++/5B5/gI0qAa/V8z8SYXZQ5Y+dWSSgoaBLlpj6sq4u3HG9GcNLm4ok3ic14/YgLf 5PFg6jyCWQc1C+c8haan58GnsyZMIh7O2c96NIjr7GS1WMv/G/SSIpTdihVCRGhp1nhN 1tXm4gglEvMVqFCLwf+6tlIMyrQEOr2A5tsH0gfNdi/J/EpgkQ2MfkE+vApvqPbPFeLx WNyEvACv4CS0Fk0oqXPwGhHf3pBjouv39GSIY7DzFaS+pXxQS+VdA+SmWMZnZ0dv0zZl 4qszW67ReHicA5tF9U5Q28ppPDgYuHSNugM7ZZ2qQBovX2vXkvbj5FY/lhZALI2YE3VE mZig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tpD1/kggmaCq2UDroZslZ9o0Gp0/4NryyenZsFdN5tg=; b=JPvb9hKM462U9is67S/ujwl3nS4Fjm5ZnXziYRynEsYigbOWGJZR+v/K9ARSgBLUin 1S20+bMw97t6VOq3o0pefU3yic66Zj/x85Azz5K6WbsGCBHTMeCY68yP1/fplDodZIuf vW7myJE28sXPZeQ9eKiB8O33DIwqPIGghYLR93ensdGtzKib0C41YBDtXP5kDL87G6mV FD0W+QpfzidHvuO32DSH+SaiM+LhE3XQNHv+Sak+lv4lpGjiw1FZmUItFojVoHGDMM2D m+aSuc/q/kxD6xdbBJDlSkrGha5srMvYlGgGxKJSut6ft0+o+xrA+AFzUQKt1jDK9IJk JWWg== X-Gm-Message-State: AN3rC/5g6XDldB2UnvWULwjL/1xYGKYpAUAQmH/duhc5MTYM07MqHA72 F/4s8Bln+xpN2rZBas23qg== X-Received: by 10.99.247.83 with SMTP id f19mr1861894pgk.190.1492735810015; Thu, 20 Apr 2017 17:50:10 -0700 (PDT) Received: from dmatlack.sea.corp.google.com ([100.100.206.82]) by smtp.gmail.com with ESMTPSA id e13sm12466486pfb.30.2017.04.20.17.50.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Apr 2017 17:50:09 -0700 (PDT) From: David Matlack To: kvm@vger.kernel.org Cc: Peter Feiner , David Matlack Subject: [kvm-unit-tests PATCH 02/32] x86: add config for each vmx unit test case Date: Thu, 20 Apr 2017 17:49:34 -0700 Message-Id: <20170421005004.137260-3-dmatlack@google.com> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog In-Reply-To: <20170421005004.137260-1-dmatlack@google.com> References: <20170421005004.137260-1-dmatlack@google.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Feiner Signed-off-by: Peter Feiner Signed-off-by: David Matlack --- x86/unittests.cfg | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ x86/vmx_tests.c | 4 +-- 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/x86/unittests.cfg b/x86/unittests.cfg index 54138388fd5d..a267638733aa 100644 --- a/x86/unittests.cfg +++ b/x86/unittests.cfg @@ -198,6 +198,91 @@ arch = x86_64 file = vmx.flat extra_params = -cpu host,+vmx arch = x86_64 +groups = vmx + +[vmx_vmenter] +file = vmx.flat +extra_params = -cpu host,+vmx -append vmenter +arch = x86_64 +groups = vmx + +[vmx_preemption_timer] +file = vmx.flat +extra_params = -cpu host,+vmx -append preemption_timer +arch = x86_64 +groups = vmx + +[vmx_control_field_PAT] +file = vmx.flat +extra_params = -cpu host,+vmx -append control_field_PAT +arch = x86_64 +groups = vmx + +[vmx_control_field_EFER] +file = vmx.flat +extra_params = -cpu host,+vmx -append control_field_EFER +arch = x86_64 +groups = vmx + +[vmx_CR_shadowing] +file = vmx.flat +extra_params = -cpu host,+vmx -append CR_shadowing +arch = x86_64 +groups = vmx + +[vmx_IO_bitmap] +file = vmx.flat +extra_params = -cpu host,+vmx -append I/O_bitmap +arch = x86_64 +groups = vmx + +[vmx_instruction_intercept] +file = vmx.flat +extra_params = -cpu host,+vmx -append instruction_intercept +arch = x86_64 +groups = vmx + +[vmx_EPT_AD_enabled] +file = vmx.flat +extra_params = -cpu host,+vmx -append EPT_A/D_enabled +arch = x86_64 +groups = vmx + +[vmx_EPT_AD_disabled] +file = vmx.flat +extra_params = -cpu host,+vmx -append EPT_A/D_disabled +arch = x86_64 +groups = vmx + +[vmx_VPID] +file = vmx.flat +extra_params = -cpu host,+vmx -append VPID +arch = x86_64 +groups = vmx + +[vmx_interrupt] +file = vmx.flat +extra_params = -cpu host,+vmx -append interrupt +arch = x86_64 +groups = vmx + +[vmx_debug_controls] +file = vmx.flat +extra_params = -cpu host,+vmx -append debug_controls +arch = x86_64 +groups = vmx + +[vmx_MSR_switch] +file = vmx.flat +extra_params = -cpu host,+vmx -append MSR_switch +arch = x86_64 +groups = vmx + +[vmx_vmmcall] +file = vmx.flat +extra_params = -cpu host,+vmx -append vmmcall +arch = x86_64 +groups = vmx [debug] file = debug.flat diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index b9115637915c..cd18b133a3a3 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -1900,8 +1900,8 @@ struct vmx_test vmx_tests[] = { NULL, {0} }, { "instruction intercept", insn_intercept_init, insn_intercept_main, insn_intercept_exit_handler, NULL, {0} }, - { "EPT, A/D disabled", ept_init, ept_main, ept_exit_handler, NULL, {0} }, - { "EPT, A/D enabled", eptad_init, eptad_main, eptad_exit_handler, NULL, {0} }, + { "EPT A/D disabled", ept_init, ept_main, ept_exit_handler, NULL, {0} }, + { "EPT A/D enabled", eptad_init, eptad_main, eptad_exit_handler, NULL, {0} }, { "VPID", vpid_init, vpid_main, vpid_exit_handler, NULL, {0} }, { "interrupt", interrupt_init, interrupt_main, interrupt_exit_handler, NULL, {0} },