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

Commit bcdec41c 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_get_sregs 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_get_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 875656fe

arch/powerpc/kvm/book3s.c

+7 −1
Original line number Diff line number Diff line
@@ -484,7 +484,13 @@ void kvmppc_subarch_vcpu_uninit(struct kvm_vcpu *vcpu) 
int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,

				  struct kvm_sregs *sregs)

{

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

	int ret;



	vcpu_load(vcpu);

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

	vcpu_put(vcpu);



	return ret;

}



int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,

arch/powerpc/kvm/booke.c

+8 −1
Original line number Diff line number Diff line
@@ -1613,11 +1613,18 @@ int kvmppc_set_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) 
int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,

                                  struct kvm_sregs *sregs)

{

	int ret;



	vcpu_load(vcpu);



	sregs->pvr = vcpu->arch.pvr;



	get_sregs_base(vcpu, sregs);

	get_sregs_arch206(vcpu, sregs);

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

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



	vcpu_put(vcpu);

	return ret;

}



int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,

arch/s390/kvm/kvm-s390.c

+4 −0
Original line number Diff line number Diff line
@@ -2734,8 +2734,12 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,

				  struct kvm_sregs *sregs)

{

	vcpu_load(vcpu);



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

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



	vcpu_put(vcpu);

	return 0;

}

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -7425,6 +7425,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
{

	struct desc_ptr dt;



	vcpu_load(vcpu);



	kvm_get_segment(vcpu, &sregs->cs, VCPU_SREG_CS);

	kvm_get_segment(vcpu, &sregs->ds, VCPU_SREG_DS);

	kvm_get_segment(vcpu, &sregs->es, VCPU_SREG_ES);
@@ -7456,6 +7458,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
		set_bit(vcpu->arch.interrupt.nr,

			(unsigned long *)sregs->interrupt_bitmap);



	vcpu_put(vcpu);

	return 0;

}

virt/kvm/kvm_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2612,9 +2612,7 @@ static long kvm_vcpu_ioctl(struct file *filp, 
		r = -ENOMEM;

		if (!kvm_sregs)

			goto out;

		vcpu_load(vcpu);

		r = kvm_arch_vcpu_ioctl_get_sregs(vcpu, kvm_sregs);

		vcpu_put(vcpu);

		if (r)

			goto out;

		r = -EFAULT;