Commit 0dd16b5b authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini

KVM: nSVM: rename nested vmcb to vmcb12

This is to be more consistient with VMX, and to support
upcoming addition of vmcb02

Hopefully no functional changes.
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20200827171145.374620-3-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1feaba14
This diff is collapsed.
...@@ -1102,7 +1102,7 @@ static void init_vmcb(struct vcpu_svm *svm) ...@@ -1102,7 +1102,7 @@ static void init_vmcb(struct vcpu_svm *svm)
} }
svm->asid_generation = 0; svm->asid_generation = 0;
svm->nested.vmcb = 0; svm->nested.vmcb12_gpa = 0;
svm->vcpu.arch.hflags = 0; svm->vcpu.arch.hflags = 0;
if (!kvm_pause_in_guest(svm->vcpu.kvm)) { if (!kvm_pause_in_guest(svm->vcpu.kvm)) {
...@@ -3881,7 +3881,7 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate) ...@@ -3881,7 +3881,7 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate)
/* FED8h - SVM Guest */ /* FED8h - SVM Guest */
put_smstate(u64, smstate, 0x7ed8, 1); put_smstate(u64, smstate, 0x7ed8, 1);
/* FEE0h - SVM Guest VMCB Physical Address */ /* FEE0h - SVM Guest VMCB Physical Address */
put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb); put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb12_gpa);
svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX]; svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP]; svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP];
...@@ -3903,7 +3903,7 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) ...@@ -3903,7 +3903,7 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)
if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) { if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) {
u64 saved_efer = GET_SMSTATE(u64, smstate, 0x7ed0); u64 saved_efer = GET_SMSTATE(u64, smstate, 0x7ed0);
u64 guest = GET_SMSTATE(u64, smstate, 0x7ed8); u64 guest = GET_SMSTATE(u64, smstate, 0x7ed8);
u64 vmcb = GET_SMSTATE(u64, smstate, 0x7ee0); u64 vmcb12_gpa = GET_SMSTATE(u64, smstate, 0x7ee0);
if (guest) { if (guest) {
if (!guest_cpuid_has(vcpu, X86_FEATURE_SVM)) if (!guest_cpuid_has(vcpu, X86_FEATURE_SVM))
...@@ -3913,10 +3913,10 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) ...@@ -3913,10 +3913,10 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)
return 1; return 1;
if (kvm_vcpu_map(&svm->vcpu, if (kvm_vcpu_map(&svm->vcpu,
gpa_to_gfn(vmcb), &map) == -EINVAL) gpa_to_gfn(vmcb12_gpa), &map) == -EINVAL)
return 1; return 1;
ret = enter_svm_guest_mode(svm, vmcb, map.hva); ret = enter_svm_guest_mode(svm, vmcb12_gpa, map.hva);
kvm_vcpu_unmap(&svm->vcpu, &map, true); kvm_vcpu_unmap(&svm->vcpu, &map, true);
} }
} }
......
...@@ -85,7 +85,7 @@ struct svm_nested_state { ...@@ -85,7 +85,7 @@ struct svm_nested_state {
struct vmcb *hsave; struct vmcb *hsave;
u64 hsave_msr; u64 hsave_msr;
u64 vm_cr_msr; u64 vm_cr_msr;
u64 vmcb; u64 vmcb12_gpa;
u32 host_intercept_exceptions; u32 host_intercept_exceptions;
/* These are the merged vectors */ /* These are the merged vectors */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment