evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: SVM: Clean up rip handling in vmrun emulation

Browse source 
This patch changes the rip handling in the vmrun emulation
path from using next_rip to the generic kvm register access
functions.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Roedel, Joerg 2010-09-03 14:21:40 +02:00 • committed by Avi Kivity
parent cda0008299
commit b75f4eb341
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/kvm/svm.c
View file

@ -2069,7 +2069,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
return false; return false;
} }
trace_kvm_nested_vmrun(svm->vmcb->save.rip - 3, vmcb_gpa, trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb_gpa,
nested_vmcb->save.rip, nested_vmcb->save.rip,
nested_vmcb->control.int_ctl, nested_vmcb->control.int_ctl,
nested_vmcb->control.event_inj, nested_vmcb->control.event_inj,
@ -2098,7 +2098,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
hsave->save.cr0 = kvm_read_cr0(&svm->vcpu); hsave->save.cr0 = kvm_read_cr0(&svm->vcpu);
hsave->save.cr4 = svm->vcpu.arch.cr4; hsave->save.cr4 = svm->vcpu.arch.cr4;
hsave->save.rflags = vmcb->save.rflags; hsave->save.rflags = vmcb->save.rflags;
hsave->save.rip = svm->next_rip; hsave->save.rip = kvm_rip_read(&svm->vcpu);
hsave->save.rsp = vmcb->save.rsp; hsave->save.rsp = vmcb->save.rsp;
hsave->save.rax = vmcb->save.rax; hsave->save.rax = vmcb->save.rax;
if (npt_enabled) if (npt_enabled)
@ -2270,8 +2270,8 @@ static int vmrun_interception(struct vcpu_svm *svm)
if (nested_svm_check_permissions(svm)) if (nested_svm_check_permissions(svm))
return 1; return 1;
svm->next_rip = kvm_rip_read(&svm->vcpu) + 3; /* Save rip after vmrun instruction */
skip_emulated_instruction(&svm->vcpu); kvm_rip_write(&svm->vcpu, kvm_rip_read(&svm->vcpu) + 3);
if (!nested_svm_vmrun(svm)) if (!nested_svm_vmrun(svm))
return 1; return 1;