46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 28e39ed55e3b01d883e0fa7d2d65937769fa5f72 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Date: Mon, 22 Jul 2019 18:22:06 +0100
|
||
|
|
Subject: [PATCH 25/39] target/i386: kvm: just return after migrate_add_blocker
|
||
|
|
failed
|
||
|
|
|
||
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Message-id: <20190722182220.19374-5-pbonzini@redhat.com>
|
||
|
|
Patchwork-id: 89622
|
||
|
|
O-Subject: [RHEL-8.1.0 PATCH qemu-kvm v3 04/18] target/i386: kvm: just return after migrate_add_blocker failed
|
||
|
|
Bugzilla: 1689269
|
||
|
|
RH-Acked-by: Peter Xu <zhexu@redhat.com>
|
||
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
|
||
|
|
From: Li Qiang <liq3ea@163.com>
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit 0c2ed83fa45aa5d80ecc7d3fff0ab38db2db5972)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/i386/kvm.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
||
|
|
index d414187..875412c 100644
|
||
|
|
--- a/target/i386/kvm.c
|
||
|
|
+++ b/target/i386/kvm.c
|
||
|
|
@@ -1142,7 +1142,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;
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|