diff options
| author | Li, Xin B <xin.b.li@intel.com> | 2007-08-01 20:49:10 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-10-13 10:18:23 +0200 |
| commit | 1e4e6e00136b82a5595de903c28912afee1178cb (patch) | |
| tree | cdbd7155de3754fafb0a20172a8e0aaec34e6bf5 | |
| parent | KVM: Use kmem_cache_free for kmem_cache_zalloc'ed objects (diff) | |
| download | linux-1e4e6e00136b82a5595de903c28912afee1178cb.tar.xz linux-1e4e6e00136b82a5595de903c28912afee1178cb.zip | |
KVM: VMX: Remove a duplicated ia32e mode vm entry control
Remove a duplicated ia32e mode VM Entry control definition and use the
proper one.
Signed-off-by: Xin Li <xin.b.li@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/vmx.c | 8 | ||||
| -rw-r--r-- | drivers/kvm/vmx.h | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 708055a50521..30c627d3b21d 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -1111,7 +1111,7 @@ static void enter_lmode(struct kvm_vcpu *vcpu) find_msr_entry(to_vmx(vcpu), MSR_EFER)->data |= EFER_LMA | EFER_LME; vmcs_write32(VM_ENTRY_CONTROLS, vmcs_read32(VM_ENTRY_CONTROLS) - | VM_ENTRY_CONTROLS_IA32E_MASK); + | VM_ENTRY_IA32E_MODE); } static void exit_lmode(struct kvm_vcpu *vcpu) @@ -1120,7 +1120,7 @@ static void exit_lmode(struct kvm_vcpu *vcpu) vmcs_write32(VM_ENTRY_CONTROLS, vmcs_read32(VM_ENTRY_CONTROLS) - & ~VM_ENTRY_CONTROLS_IA32E_MASK); + & ~VM_ENTRY_IA32E_MODE); } #endif @@ -1185,13 +1185,13 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer) if (efer & EFER_LMA) { vmcs_write32(VM_ENTRY_CONTROLS, vmcs_read32(VM_ENTRY_CONTROLS) | - VM_ENTRY_CONTROLS_IA32E_MASK); + VM_ENTRY_IA32E_MODE); msr->data = efer; } else { vmcs_write32(VM_ENTRY_CONTROLS, vmcs_read32(VM_ENTRY_CONTROLS) & - ~VM_ENTRY_CONTROLS_IA32E_MASK); + ~VM_ENTRY_IA32E_MODE); msr->data = efer & ~EFER_LME; } diff --git a/drivers/kvm/vmx.h b/drivers/kvm/vmx.h index 7e4dc1208dd4..35d0b58c0a0b 100644 --- a/drivers/kvm/vmx.h +++ b/drivers/kvm/vmx.h @@ -268,9 +268,6 @@ enum vmcs_field { /* segment AR */ #define SEGMENT_AR_L_MASK (1 << 13) -/* entry controls */ -#define VM_ENTRY_CONTROLS_IA32E_MASK (1 << 9) - #define AR_TYPE_ACCESSES_MASK 1 #define AR_TYPE_READABLE_MASK (1 << 1) #define AR_TYPE_WRITEABLE_MASK (1 << 2) |