Commit 6b2341ee authored by Liran Alon's avatar Liran Alon Committed by Paolo Bonzini
Browse files

target/i386: kvm: Delete VMX migration blocker on vCPU init failure 



Commit d98f2607 ("target/i386: kvm: add VMX migration blocker")
added migration blocker for vCPU exposed with Intel VMX because QEMU
doesn't yet contain code to support migration of nested virtualization
workloads.

However, that commit missed adding deletion of the migration blocker in
case init of vCPU failed. Similar to invtsc_mig_blocker. This commit fix
that issue.

Fixes: d98f2607 ("target/i386: kvm: add VMX migration blocker")
Signed-off-by: default avatarLiran Alon <liran.alon@oracle.com>
Reviewed-by: default avatarMaran Wilson <maran.wilson@oracle.com>
Message-Id: <20190619162140.133674-2-liran.alon@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 597360c0

target/i386/kvm.c

+5 −2
Original line number Diff line number Diff line
@@ -1333,7 +1333,7 @@ int kvm_arch_init_vcpu(CPUState *cs) 


    r = kvm_arch_set_tsc_khz(cs);

    if (r < 0) {

        goto fail;

        return r;

    }



    /* vcpu's TSC frequency is either specified by user, or following
@@ -1622,7 +1622,7 @@ int kvm_arch_init_vcpu(CPUState *cs) 
            if (local_err) {

                error_report_err(local_err);

                error_free(invtsc_mig_blocker);

                return r;

                goto fail2;

            }

        }

    }
@@ -1673,6 +1673,9 @@ int kvm_arch_init_vcpu(CPUState *cs) 


 fail:

    migrate_del_blocker(invtsc_mig_blocker);

 fail2:

    migrate_del_blocker(vmx_mig_blocker);



    return r;

}