diff options
| author | Avi Kivity | 2010-11-29 15:12:30 +0100 |
|---|---|---|
| committer | Avi Kivity | 2011-01-12 10:30:02 +0100 |
| commit | 6389ee946303cb4313dba0a49865e495a53351ff (patch) | |
| tree | 478c8f5f4d9f75d77808d648adbc8948050ffee7 /arch/x86/kvm/svm.c | |
| parent | KVM: Push struct x86_exception into walk_addr() (diff) | |
| download | kernel-qcow2-linux-6389ee946303cb4313dba0a49865e495a53351ff.tar.gz kernel-qcow2-linux-6389ee946303cb4313dba0a49865e495a53351ff.tar.xz kernel-qcow2-linux-6389ee946303cb4313dba0a49865e495a53351ff.zip | |
KVM: Pull extra page fault information into struct x86_exception
Currently page fault cr2 and nesting infomation are carried outside
the fault data structure. Instead they are placed in the vcpu struct,
which results in confusion as global variables are manipulated instead
of passing parameters.
Fix this issue by adding address and nested fields to struct x86_exception,
so this struct can carry all information associated with a fault.
Signed-off-by: Avi Kivity <avi@redhat.com>
Tested-by: Joerg Roedel <joerg.roedel@amd.com>
Tested-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 28274cf307ba..b985cb81a573 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1647,14 +1647,15 @@ static void nested_svm_set_tdp_cr3(struct kvm_vcpu *vcpu, force_new_asid(vcpu); } -static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu) +static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu, + struct x86_exception *fault) { struct vcpu_svm *svm = to_svm(vcpu); svm->vmcb->control.exit_code = SVM_EXIT_NPF; svm->vmcb->control.exit_code_hi = 0; - svm->vmcb->control.exit_info_1 = vcpu->arch.fault.error_code; - svm->vmcb->control.exit_info_2 = vcpu->arch.fault.address; + svm->vmcb->control.exit_info_1 = fault->error_code; + svm->vmcb->control.exit_info_2 = fault->address; nested_svm_vmexit(svm); } |