summaryrefslogtreecommitdiff
path: root/arch/x86/kvm/svm
diff options
context:
space:
mode:
authorMaxim Levitsky <mlevitsk@redhat.com>2020-08-27 20:11:42 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2020-09-28 07:57:12 -0400
commit8d22b90e942c26d33dcccaef398cbf7f9b4e39d6 (patch)
tree59ec760d985ee8fa882e3e25b82773845c27ea24 /arch/x86/kvm/svm
parent0681de1b83697bcbc06b843d0c8302da45855205 (diff)
KVM: SVM: refactor exit labels in svm_create_vcpu
Kernel coding style suggests not to use labels like error1,error2 Suggested-by: Jim Mattson <jmattson@google.com> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Message-Id: <20200827171145.374620-6-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm')
-rw-r--r--arch/x86/kvm/svm/svm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 22886b1d9af7..281e93b47a07 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -1196,11 +1196,11 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
hsave_page = alloc_page(GFP_KERNEL_ACCOUNT | __GFP_ZERO);
if (!hsave_page)
- goto free_page1;
+ goto error_free_vmcb_page;
err = avic_init_vcpu(svm);
if (err)
- goto free_page2;
+ goto error_free_hsave_page;
/* We initialize this flag to true to make sure that the is_running
* bit would be set the first time the vcpu is loaded.
@@ -1212,11 +1212,11 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
svm->msrpm = svm_vcpu_init_msrpm();
if (!svm->msrpm)
- goto free_page2;
+ goto error_free_hsave_page;
svm->nested.msrpm = svm_vcpu_init_msrpm();
if (!svm->nested.msrpm)
- goto free_page3;
+ goto error_free_msrpm;
svm->vmcb = page_address(vmcb_page);
svm->vmcb_pa = __sme_set(page_to_pfn(vmcb_page) << PAGE_SHIFT);
@@ -1228,11 +1228,11 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
return 0;
-free_page3:
+error_free_msrpm:
svm_vcpu_free_msrpm(svm->msrpm);
-free_page2:
+error_free_hsave_page:
__free_page(hsave_page);
-free_page1:
+error_free_vmcb_page:
__free_page(vmcb_page);
out:
return err;