Skip to content

Commit 24bc5fe

Browse files
committed
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fix from Radim Krčmář: "Fix a regression that prevented migration between hosts with different XSAVE features even if the missing features were not used by the guest (for stable)" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: do not save guest-unsupported XSAVE state
2 parents 412e6d3 + 00c87e9 commit 24bc5fe

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/kvm/x86.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,6 +3182,7 @@ static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)
31823182
memcpy(dest, xsave, XSAVE_HDR_OFFSET);
31833183

31843184
/* Set XSTATE_BV */
3185+
xstate_bv &= vcpu->arch.guest_supported_xcr0 | XFEATURE_MASK_FPSSE;
31853186
*(u64 *)(dest + XSAVE_HDR_OFFSET) = xstate_bv;
31863187

31873188
/*

0 commit comments

Comments
 (0)