Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d0be540 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 92616ee6 07868fc6

arch/powerpc/kvm/booke.c

+2 −1
Original line number Diff line number Diff line
@@ -673,7 +673,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
		ret = s;

		goto out;

	}

	kvmppc_lazy_ee_enable();



	kvm_guest_enter();
@@ -699,6 +698,8 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
	kvmppc_load_guest_fp(vcpu);

#endif



	kvmppc_lazy_ee_enable();



	ret = __kvmppc_vcpu_run(kvm_run, vcpu);



	/* No need for kvm_guest_exit. It's done in handle_exit.

arch/x86/kernel/kvmclock.c

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ void __init kvmclock_init(void) 
	if (!mem)

		return;

	hv_clock = __va(mem);

	memset(hv_clock, 0, size);



	if (kvm_register_clock("boot clock")) {

		hv_clock = NULL;

arch/x86/kvm/x86.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

	}