tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
"Three one-line fixes for my first pull request; one for x86 host, one
for x86 guest, one for PPC"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
x86: kvmclock: zero initialize pvclock shared memory area
kvm/ppc/booke: Delay kvmppc_lazy_ee_enable
KVM: x86: remove vcpu's CPL check in host-invoked XCR set

Linus Torvalds 9d0be540 92616ee6

+5 -4
+2 -1
arch/powerpc/kvm/booke.c
··· 673 673 ret = s; 674 674 goto out; 675 675 } 676 - kvmppc_lazy_ee_enable(); 677 676 678 677 kvm_guest_enter(); 679 678 ··· 697 698 698 699 kvmppc_load_guest_fp(vcpu); 699 700 #endif 701 + 702 + kvmppc_lazy_ee_enable(); 700 703 701 704 ret = __kvmppc_vcpu_run(kvm_run, vcpu); 702 705
+1
arch/x86/kernel/kvmclock.c
··· 242 242 if (!mem) 243 243 return; 244 244 hv_clock = __va(mem); 245 + memset(hv_clock, 0, size); 245 246 246 247 if (kvm_register_clock("boot clock")) { 247 248 hv_clock = NULL;
+2 -3
arch/x86/kvm/x86.c
··· 582 582 if (index != XCR_XFEATURE_ENABLED_MASK) 583 583 return 1; 584 584 xcr0 = xcr; 585 - if (kvm_x86_ops->get_cpl(vcpu) != 0) 586 - return 1; 587 585 if (!(xcr0 & XSTATE_FP)) 588 586 return 1; 589 587 if ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) ··· 595 597 596 598 int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr) 597 599 { 598 - if (__kvm_set_xcr(vcpu, index, xcr)) { 600 + if (kvm_x86_ops->get_cpl(vcpu) != 0 || 601 + __kvm_set_xcr(vcpu, index, xcr)) { 599 602 kvm_inject_gp(vcpu, 0); 600 603 return 1; 601 604 }