From: Avi Kivity Fixes sf bug 1614113 (segfaults in nbench). Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton --- drivers/kvm/svm.c | 9 +++++++++ 1 files changed, 9 insertions(+) diff -puN drivers/kvm/svm.c~kvm-amd-svm-save-and-restore-the-floating-point-unit drivers/kvm/svm.c --- a/drivers/kvm/svm.c~kvm-amd-svm-save-and-restore-the-floating-point-unit +++ a/drivers/kvm/svm.c @@ -575,6 +575,8 @@ static int svm_create_vcpu(struct kvm_vc memset(vcpu->svm->db_regs, 0, sizeof(vcpu->svm->db_regs)); init_vmcb(vcpu->svm->vmcb); + fx_init(vcpu); + return 0; out2: @@ -1387,6 +1389,10 @@ again: save_db_regs(vcpu->svm->host_db_regs); load_db_regs(vcpu->svm->db_regs); } + + fx_save(vcpu->host_fx_image); + fx_restore(vcpu->guest_fx_image); + asm volatile ( #ifdef CONFIG_X86_64 "push %%rbx; push %%rcx; push %%rdx;" @@ -1496,6 +1502,9 @@ again: #endif : "cc", "memory" ); + fx_save(vcpu->guest_fx_image); + fx_restore(vcpu->host_fx_image); + if ((vcpu->svm->vmcb->save.dr7 & 0xff)) load_db_regs(vcpu->svm->host_db_regs); _