From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arthur Chunqi Li Subject: [PATCH] kvm-unit-tests: VMX: Fix two minor bugs Date: Wed, 11 Sep 2013 11:11:49 +0800 Message-ID: <1378869109-14128-1-git-send-email-yzt356@gmail.com> Cc: jan.kiszka@siemens.com, gleb@redhat.com, pbonzini@redhat.com, Arthur Chunqi Li To: kvm@vger.kernel.org Return-path: Received: from mail-pd0-f170.google.com ([209.85.192.170]:55190 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753241Ab3IKDMD (ORCPT ); Tue, 10 Sep 2013 23:12:03 -0400 Received: by mail-pd0-f170.google.com with SMTP id x10so8570165pdj.29 for ; Tue, 10 Sep 2013 20:12:02 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: This patch just contains two minor changes to EPT framwork. 1. Reorder macro definition 2. Fix bug of setting CPU_EPT without check. Signed-off-by: Arthur Chunqi Li --- x86/vmx.h | 2 +- x86/vmx_tests.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x86/vmx.h b/x86/vmx.h index e02183f..dc1ebdf 100644 --- a/x86/vmx.h +++ b/x86/vmx.h @@ -366,9 +366,9 @@ enum Ctrl0 { CPU_NMI_WINDOW = 1ul << 22, CPU_IO = 1ul << 24, CPU_IO_BITMAP = 1ul << 25, + CPU_MSR_BITMAP = 1ul << 28, CPU_MONITOR = 1ul << 29, CPU_PAUSE = 1ul << 30, - CPU_MSR_BITMAP = 1ul << 28, CPU_SECONDARY = 1ul << 31, }; diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index e891a9f..0759e10 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -925,7 +925,7 @@ static void ept_init() ctrl_cpu[1] = (ctrl_cpu[1] | CPU_EPT) & ctrl_cpu_rev[1].clr; vmcs_write(CPU_EXEC_CTRL0, ctrl_cpu[0]); - vmcs_write(CPU_EXEC_CTRL1, ctrl_cpu[1] | CPU_EPT); + vmcs_write(CPU_EXEC_CTRL1, ctrl_cpu[1]); if (setup_ept()) init_fail = true; data_page1 = alloc_page(); -- 1.7.9.5