KVM: x86: introduce kvm_supported_xcr0()

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kvm / x86.c

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a37da6b0165a28a0882137a496427fd733205de7..3f5fb4535f9c6f18d37daa16bbd33773be135352 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3084,9 +3084,7 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
                 * CPUID leaf 0xD, index 0, EDX:EAX.  This is for compatibility
                 * with old userspace.
                 */
-               if (xstate_bv & ~KVM_SUPPORTED_XCR0)
-                       return -EINVAL;
-               if (xstate_bv & ~host_xcr0)
+               if (xstate_bv & ~kvm_supported_xcr0())
                        return -EINVAL;
                memcpy(&vcpu->arch.guest_fpu.state->xsave,
                        guest_xsave->region, vcpu->arch.guest_xstate_size);