In preparation for moving efer_reserved_bits into kvm_caps, reverse its polarity and make it efer_supported_bits, to be more consistent with other fields in kvm_caps. No functional change intended. Signed-off-by: Yosry Ahmed --- arch/x86/kvm/msrs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/msrs.c b/arch/x86/kvm/msrs.c index 17d4c813a9e8a..10669c5418da3 100644 --- a/arch/x86/kvm/msrs.c +++ b/arch/x86/kvm/msrs.c @@ -20,7 +20,7 @@ module_param(report_ignored_msrs, bool, 0644); EXPORT_SYMBOL_FOR_KVM_INTERNAL(report_ignored_msrs); /* Enable syscall by default because its emulated by KVM */ -static u64 __read_mostly efer_reserved_bits = ~((u64)EFER_SCE); +static u64 __read_mostly efer_supported_bits = ((u64)EFER_SCE); #define MAX_IO_MSRS 256 @@ -606,7 +606,7 @@ static bool __kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer) } bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer) { - if (efer & efer_reserved_bits) + if (efer & ~efer_supported_bits) return false; return __kvm_valid_efer(vcpu, efer); @@ -619,7 +619,7 @@ static int set_efer(struct kvm_vcpu *vcpu, struct msr_data *msr_info) u64 efer = msr_info->data; int r; - if (efer & efer_reserved_bits) + if (efer & ~efer_supported_bits) return 1; if (!msr_info->host_initiated) { @@ -652,13 +652,13 @@ static int set_efer(struct kvm_vcpu *vcpu, struct msr_data *msr_info) void kvm_enable_efer_bits(u64 mask) { - efer_reserved_bits &= ~mask; + efer_supported_bits |= mask; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_enable_efer_bits); void kvm_disable_efer_bits(u64 mask) { - efer_reserved_bits |= mask; + efer_supported_bits &= ~mask; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_disable_efer_bits); -- 2.55.0.rc2.803.g1fd1e6609c-goog