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

Commit b4ef9d4e authored by Christoffer Dall's avatar Christoffer Dall Committed by Paolo Bonzini
Browse files

KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_sregs 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_set_sregs().

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bcdec41c

arch/powerpc/kvm/book3s.c

+7 −1
Original line number Diff line number Diff line
@@ -496,7 +496,13 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,

				  struct kvm_sregs *sregs)

{

	return vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);

	int ret;



	vcpu_load(vcpu);

	ret = vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);

	vcpu_put(vcpu);



	return ret;

}



int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

arch/powerpc/kvm/booke.c

+10 −5
Original line number Diff line number Diff line
@@ -1630,20 +1630,25 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,

                                  struct kvm_sregs *sregs)

{

	int ret;

	int ret = -EINVAL;



	vcpu_load(vcpu);

	if (vcpu->arch.pvr != sregs->pvr)

		return -EINVAL;

		goto out;



	ret = set_sregs_base(vcpu, sregs);

	if (ret < 0)

		return ret;

		goto out;



	ret = set_sregs_arch206(vcpu, sregs);

	if (ret < 0)

		return ret;

		goto out;



	ret = vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);



	return vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);

out:

	vcpu_put(vcpu);

	return ret;

}



int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id,

arch/s390/kvm/kvm-s390.c

+4 −0
Original line number Diff line number Diff line
@@ -2726,8 +2726,12 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,

				  struct kvm_sregs *sregs)

{

	vcpu_load(vcpu);



	memcpy(&vcpu->run->s.regs.acrs, &sregs->acrs, sizeof(sregs->acrs));

	memcpy(&vcpu->arch.sie_block->gcr, &sregs->crs, sizeof(sregs->crs));



	vcpu_put(vcpu);

	return 0;

}

arch/x86/kvm/x86.c

+9 −3
Original line number Diff line number Diff line
@@ -7525,15 +7525,18 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	int mmu_reset_needed = 0;

	int pending_vec, max_bits, idx;

	struct desc_ptr dt;

	int ret = -EINVAL;



	vcpu_load(vcpu);



	if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&

			(sregs->cr4 & X86_CR4_OSXSAVE))

		return -EINVAL;

		goto out;



	apic_base_msr.data = sregs->apic_base;

	apic_base_msr.host_initiated = true;

	if (kvm_set_apic_base(vcpu, &apic_base_msr))

		return -EINVAL;

		goto out;



	dt.size = sregs->idt.limit;

	dt.address = sregs->idt.base;
@@ -7599,7 +7602,10 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 


	kvm_make_request(KVM_REQ_EVENT, vcpu);



	return 0;

	ret = 0;

out:

	vcpu_put(vcpu);

	return ret;

}



int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

virt/kvm/kvm_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2628,9 +2628,7 @@ static long kvm_vcpu_ioctl(struct file *filp, 
			kvm_sregs = NULL;

			goto out;

		}

		vcpu_load(vcpu);

		r = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs);

		vcpu_put(vcpu);

		break;

	}

	case KVM_GET_MP_STATE: {