From: Li Qiang <liq3ea@163.com>
Date: Sat, 6 Oct 2018 09:18:16 +0000 (-0700)
Subject: target/i386: kvm: just return after migrate_add_blocker failed
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0c2ed83fa45aa5d80ecc7d3fff0ab38db2db5972;p=qemu.git

target/i386: kvm: just return after migrate_add_blocker failed

When migrate_add_blocker failed, the invtsc_mig_blocker is not
appended so no need to remove. This can save several instructions.

Signed-off-by: Li Qiang <liq3ea@163.com>
Message-Id: <20181006091816.7659-1-liq3ea@163.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 7b7a56593e..115d8b4c14 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1198,7 +1198,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
             if (local_err) {
                 error_report_err(local_err);
                 error_free(invtsc_mig_blocker);
-                goto fail;
+                return r;
             }
             /* for savevm */
             vmstate_x86_cpu.unmigratable = 1;