|
@@ -582,8 +582,6 @@ int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
|
|
|
if (index != XCR_XFEATURE_ENABLED_MASK)
|
|
|
return 1;
|
|
|
xcr0 = xcr;
|
|
|
- if (kvm_x86_ops->get_cpl(vcpu) != 0)
|
|
|
- return 1;
|
|
|
if (!(xcr0 & XSTATE_FP))
|
|
|
return 1;
|
|
|
if ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE))
|
|
@@ -597,7 +595,8 @@ int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
|
|
|
|
|
|
int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
|
|
|
{
|
|
|
- if (__kvm_set_xcr(vcpu, index, xcr)) {
|
|
|
+ if (kvm_x86_ops->get_cpl(vcpu) != 0 ||
|
|
|
+ __kvm_set_xcr(vcpu, index, xcr)) {
|
|
|
kvm_inject_gp(vcpu, 0);
|
|
|
return 1;
|
|
|
}
|