From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yang, Sheng" Subject: [PATCH] KVM: VMX: Some defined name fix Date: Tue, 24 Jun 2008 17:07:23 +0800 Message-ID: <200806241707.23175.sheng.yang@intel.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_LlLYID41gDQ8Z5T" To: kvm@vger.kernel.org Return-path: Received: from mga14.intel.com ([143.182.124.37]:10229 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935AbYFXJHH (ORCPT ); Tue, 24 Jun 2008 05:07:07 -0400 Sender: kvm-owner@vger.kernel.org List-ID: --Boundary-00=_LlLYID41gDQ8Z5T Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline =46rom 0dae764c94f48bd05f796947df1c85028ade59fa Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Tue, 24 Jun 2008 17:02:38 +0800 Subject: [PATCH] KVM: VMX: Some defined name fix MSR_IA32_FEATURE_LOCKED is just a bit in fact, which shouldn't prefix with= =20 MSR_. So did MSR_IA32_FEATURE_VMXON_ENABLED. Signed-off-by: Sheng Yang =2D-- arch/x86/kvm/vmx.c | 18 +++++++++--------- arch/x86/kvm/vmx.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6e4278d..cc3f52b 100644 =2D-- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1015,9 +1015,9 @@ static __init int vmx_disabled_by_bios(void) u64 msr; rdmsrl(MSR_IA32_FEATURE_CONTROL, msr); =2D return (msr & (MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) =2D =3D=3D MSR_IA32_FEATURE_CONTROL_LOCKED; + return (msr & (IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) + =3D=3D IA32_FEATURE_CONTROL_LOCKED_BIT; /* locked but not enabled */ } @@ -1029,14 +1029,14 @@ static void hardware_enable(void *garbage) INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu)); rdmsrl(MSR_IA32_FEATURE_CONTROL, old); =2D if ((old & (MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) =2D !=3D (MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) + if ((old & (IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) + !=3D (IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) /* enable and lock */ wrmsrl(MSR_IA32_FEATURE_CONTROL, old | =2D MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED); + IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT); write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */ asm volatile (ASM_VMX_VMXON_RAX : : "a"(&phys_addr), "m"(phys_addr) diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index 425a134..0c22e5f 100644 =2D-- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h @@ -346,8 +346,8 @@ enum vmcs_field { #define MSR_IA32_VMX_EPT_VPID_CAP 0x48c #define MSR_IA32_FEATURE_CONTROL 0x3a =2D#define MSR_IA32_FEATURE_CONTROL_LOCKED 0x1 =2D#define MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED 0x4 +#define IA32_FEATURE_CONTROL_LOCKED_BIT 0x1 +#define IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT 0x4 #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9 #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10 =2D- 1.5.5 --Boundary-00=_LlLYID41gDQ8Z5T Content-Type: text/x-diff; charset="utf-8"; name="0001-KVM-VMX-Some-defined-name-fix.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-KVM-VMX-Some-defined-name-fix.patch" =46rom 0dae764c94f48bd05f796947df1c85028ade59fa Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Tue, 24 Jun 2008 17:02:38 +0800 Subject: [PATCH] KVM: VMX: Some defined name fix MSR_IA32_FEATURE_LOCKED is just a bit in fact, which shouldn't prefix with = MSR_. So did MSR_IA32_FEATURE_VMXON_ENABLED. Signed-off-by: Sheng Yang =2D-- arch/x86/kvm/vmx.c | 18 +++++++++--------- arch/x86/kvm/vmx.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6e4278d..cc3f52b 100644 =2D-- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1015,9 +1015,9 @@ static __init int vmx_disabled_by_bios(void) u64 msr; =20 rdmsrl(MSR_IA32_FEATURE_CONTROL, msr); =2D return (msr & (MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) =2D =3D=3D MSR_IA32_FEATURE_CONTROL_LOCKED; + return (msr & (IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) + =3D=3D IA32_FEATURE_CONTROL_LOCKED_BIT; /* locked but not enabled */ } =20 @@ -1029,14 +1029,14 @@ static void hardware_enable(void *garbage) =20 INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu)); rdmsrl(MSR_IA32_FEATURE_CONTROL, old); =2D if ((old & (MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) =2D !=3D (MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) + if ((old & (IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) + !=3D (IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) /* enable and lock */ wrmsrl(MSR_IA32_FEATURE_CONTROL, old | =2D MSR_IA32_FEATURE_CONTROL_LOCKED | =2D MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED); + IA32_FEATURE_CONTROL_LOCKED_BIT | + IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT); write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */ asm volatile (ASM_VMX_VMXON_RAX : : "a"(&phys_addr), "m"(phys_addr) diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index 425a134..0c22e5f 100644 =2D-- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h @@ -346,8 +346,8 @@ enum vmcs_field { #define MSR_IA32_VMX_EPT_VPID_CAP 0x48c =20 #define MSR_IA32_FEATURE_CONTROL 0x3a =2D#define MSR_IA32_FEATURE_CONTROL_LOCKED 0x1 =2D#define MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED 0x4 +#define IA32_FEATURE_CONTROL_LOCKED_BIT 0x1 +#define IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT 0x4 =20 #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9 #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10 =2D-=20 1.5.5 --Boundary-00=_LlLYID41gDQ8Z5T--