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

Commit 6a96bc7f 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_fpu 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_set_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 1393123e

arch/s390/kvm/kvm-s390.c

+12 −3
Original line number Diff line number Diff line
@@ -2749,15 +2749,24 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 


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

{

	if (test_fp_ctl(fpu->fpc))

		return -EINVAL;

	int ret = 0;



	vcpu_load(vcpu);



	if (test_fp_ctl(fpu->fpc)) {

		ret = -EINVAL;

		goto out;

	}

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

	if (MACHINE_HAS_VX)

		convert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs,

				 (freg_t *) fpu->fprs);

	else

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

	return 0;



out:

	vcpu_put(vcpu);

	return ret;

}



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

arch/x86/kvm/x86.c

+6 −2
Original line number Diff line number Diff line
@@ -7722,8 +7722,11 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 


int kvm_arch_vcpu_ioctl_set_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(fxsave->st_space, fpu->fpr, 128);

	fxsave->cwd = fpu->fcw;
@@ -7734,6 +7737,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 
	fxsave->rdp = fpu->last_dp;

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



	vcpu_put(vcpu);

	return 0;

}

virt/kvm/kvm_main.c

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

			goto out;

		}

		vcpu_load(vcpu);

		r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu);

		vcpu_put(vcpu);

		break;

	}

	default: