summaryrefslogtreecommitdiff
path: root/arch/s390/kvm/kvm-s390.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r--arch/s390/kvm/kvm-s390.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 8c222b0dfbf2..6500f80a7086 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -4949,11 +4949,7 @@ static void sync_regs(struct kvm_vcpu *vcpu)
}
save_access_regs(vcpu->arch.host_acrs);
restore_access_regs(vcpu->run->s.regs.acrs);
- fpu_lfpc_safe(&vcpu->run->s.regs.fpc);
- if (cpu_has_vx())
- load_vx_regs((__vector128 *)&vcpu->run->s.regs.vrs);
- else
- load_fp_regs((freg_t *)&vcpu->run->s.regs.fprs);
+ kvm_s390_fpu_load(vcpu->run);
/* Sync fmt2 only data */
if (likely(!kvm_s390_pv_cpu_is_protected(vcpu))) {
sync_regs_fmt2(vcpu);
@@ -5014,11 +5010,7 @@ static void store_regs(struct kvm_vcpu *vcpu)
kvm_run->s.regs.pfc = vcpu->arch.pfault_compare;
save_access_regs(vcpu->run->s.regs.acrs);
restore_access_regs(vcpu->arch.host_acrs);
- fpu_stfpc(&vcpu->run->s.regs.fpc);
- if (cpu_has_vx())
- save_vx_regs((__vector128 *)&vcpu->run->s.regs.vrs);
- else
- save_fp_regs((freg_t *)&vcpu->run->s.regs.fprs);
+ kvm_s390_fpu_store(vcpu->run);
if (likely(!kvm_s390_pv_cpu_is_protected(vcpu)))
store_regs_fmt2(vcpu);
}
@@ -5167,11 +5159,7 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
* switch in the run ioctl. Let's update our copies before we save
* it into the save area
*/
- fpu_stfpc(&vcpu->run->s.regs.fpc);
- if (cpu_has_vx())
- save_vx_regs((__vector128 *)&vcpu->run->s.regs.vrs);
- else
- save_fp_regs((freg_t *)&vcpu->run->s.regs.fprs);
+ kvm_s390_fpu_store(vcpu->run);
save_access_regs(vcpu->run->s.regs.acrs);
return kvm_s390_store_status_unloaded(vcpu, addr);