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

Commit 1393123e 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_fpu 



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

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

arch/s390/kvm/kvm-s390.c

+4 −0
Original line number Diff line number Diff line
@@ -2762,6 +2762,8 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 


int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	vcpu_load(vcpu);



	/* make sure we have the latest values */

	save_fpu_regs();

	if (MACHINE_HAS_VX)
@@ -2770,6 +2772,8 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 
	else

		memcpy(fpu->fprs, vcpu->run->s.regs.fprs, sizeof(fpu->fprs));

	fpu->fpc = vcpu->run->s.regs.fpc;



	vcpu_put(vcpu);

	return 0;

}

arch/x86/kvm/x86.c

+5 −2
Original line number Diff line number Diff line
@@ -7702,9 +7702,11 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 


int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	struct fxregs_state *fxsave =

			&vcpu->arch.guest_fpu.state.fxsave;

	struct fxregs_state *fxsave;



	vcpu_load(vcpu);



	fxsave = &vcpu->arch.guest_fpu.state.fxsave;

	memcpy(fpu->fpr, fxsave->st_space, 128);

	fpu->fcw = fxsave->cwd;

	fpu->fsw = fxsave->swd;
@@ -7714,6 +7716,7 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 
	fpu->last_dp = fxsave->rdp;

	memcpy(fpu->xmm, fxsave->xmm_space, sizeof fxsave->xmm_space);



	vcpu_put(vcpu);

	return 0;

}

virt/kvm/kvm_main.c

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

		if (!fpu)

			goto out;

		vcpu_load(vcpu);

		r = kvm_arch_vcpu_ioctl_get_fpu(vcpu, fpu);

		vcpu_put(vcpu);

		if (r)

			goto out;

		r = -EFAULT;