Unverified Commit fc2e6c4f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5420 [sync] PR-5317: KVM: s390: fix setting of fpc register 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5317 
 
PR sync from: Ze Zuo <zuoze1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HCQYSNRNP26GKEFGZOTQJHP6XGQVAHOB/ 
 
https://gitee.com/src-openeuler/kernel/issues/I96GPO 
 
Link:https://gitee.com/openeuler/kernel/pulls/5420

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a2378ea0 a273f973

arch/s390/kvm/kvm-s390.c

+0 −5
Original line number Diff line number Diff line
@@ -3628,10 +3628,6 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 


	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,
@@ -3639,7 +3635,6 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 
	else

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



out:

	vcpu_put(vcpu);

	return ret;

}