summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2019-11-23 10:45:50 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2019-11-23 11:29:17 +0100
commitfaf0be22167486feb1ee386f0e819a336e829d0a (patch)
tree9ea3c92b86eec2d82230a9407b44f4ec63ab354c /virt
parent24885d1d79e2e83d49201aeae0bc59f1402fd4f1 (diff)
downloadlinux-faf0be22167486feb1ee386f0e819a336e829d0a.tar.gz
linux-faf0be22167486feb1ee386f0e819a336e829d0a.tar.bz2
linux-faf0be22167486feb1ee386f0e819a336e829d0a.zip
KVM: Fix jump label out_free_* in kvm_init()
The jump label out_free_1 and out_free_2 deal with the same stuff, so git rid of one and rename the label out_free_0a to retain the label name order. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 13e6b7094596..00268290dcbd 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4354,12 +4354,12 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
r = kvm_arch_hardware_setup();
if (r < 0)
- goto out_free_0a;
+ goto out_free_1;
for_each_online_cpu(cpu) {
smp_call_function_single(cpu, check_processor_compat, &r, 1);
if (r < 0)
- goto out_free_1;
+ goto out_free_2;
}
r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "kvm/cpu:starting",
@@ -4416,9 +4416,8 @@ out_free_3:
unregister_reboot_notifier(&kvm_reboot_notifier);
cpuhp_remove_state_nocalls(CPUHP_AP_KVM_STARTING);
out_free_2:
-out_free_1:
kvm_arch_hardware_unsetup();
-out_free_0a:
+out_free_1:
free_cpumask_var(cpus_hardware_enabled);
out_free_0:
kvm_irqfd_exit();