Remove KVM specific defines for MSR_EFER from svm.c
PATCH 1/1 Remove KVM specific defines for MSR_EFER from svm.c
This patch removes the KVM specific defines for MSR_EFER that were being used in the svm support file and migrates all references to use instead the ones from the kernel headers that are used everywhere else and that have the same values.
Signed-off-by Carlo Marcelo Arenas Belon <[email protected]>
--- drivers/kvm/svm.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-)
drivers/kvm/svm.c +7 -10
@@ -42,9 +42,6 @@ MODULE_LICENSE("GPL");#define SEG_TYPE_LDT 2#define SEG_TYPE_BUSY_TSS16 3 -#define KVM_EFER_LMA (1 << 10) -#define KVM_EFER_LME (1 << 8) -#define SVM_FEATURE_NPT (1 << 0)#define SVM_FEATURE_LBRV (1 << 1)#define SVM_DEATURE_SVML (1 << 2)
@@ -184,8 +181,8 @@ static inline void flush_guest_tlb(struct kvm_vcpu *vcpu)static void svm_set_efer (struct kvm_vcpu *vcpu,u64 efer) { -if (!(efer &KVM_EFER_LMA )) - efer &= ~KVM_EFER_LME ; +if (!(efer &EFER_LMA )) + efer &= ~EFER_LME ;to_svm (vcpu)->vmcb->save.efer = efer |MSR_EFER_SVME_MASK ; vcpu->shadow_efer = efer;
@@ -777,15 +774,15 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)struct vcpu_svm *svm =to_svm (vcpu);#ifdef CONFIG_X86_64 -if (vcpu->shadow_efer &KVM_EFER_LME ) { +if (vcpu->shadow_efer &EFER_LME ) {if (!is_paging (vcpu) && (cr0 &X86_CR0_PG )) { - vcpu->shadow_efer |=KVM_EFER_LMA ; - svm->vmcb->save.efer |=KVM_EFER_LMA |KVM_EFER_LME ; + vcpu->shadow_efer |=EFER_LMA ; + svm->vmcb->save.efer |=EFER_LMA |EFER_LME ; }if (is_paging (vcpu) && !(cr0 &X86_CR0_PG )) { - vcpu->shadow_efer &= ~KVM_EFER_LMA ; - svm->vmcb->save.efer &= ~(KVM_EFER_LMA |KVM_EFER_LME ); + vcpu->shadow_efer &= ~EFER_LMA ; + svm->vmcb->save.efer &= ~(EFER_LMA |EFER_LME ); } }#endif
Signature · 8 lines
1.5.2.5 ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
Avi Kivity
AppliedQuoted 5 lines · Carlo Marcelo Arenas Belon
This patch removes the KVM specific defines for
MSR_EFERthat were being used in the svm support file and migrates all references to use instead the ones from the kernel headers that are used everywhere else and that have the same values.
Applied, thanks.
Signature · 8 lines
error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4