* [Qemu-devel] [PATCH] target/i386: kvm: just return after migrate_add_blocker failed
@ 2018-10-06 9:18 Li Qiang
2018-10-08 11:12 ` Dr. David Alan Gilbert
0 siblings, 1 reply; 2+ messages in thread
From: Li Qiang @ 2018-10-06 9:18 UTC (permalink / raw)
To: pbonzini, dgilbert; +Cc: qemu-devel, Li Qiang
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>
---
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 0b2a07d3a4..6ba84a39f3 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1153,7 +1153,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;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] target/i386: kvm: just return after migrate_add_blocker failed
2018-10-06 9:18 [Qemu-devel] [PATCH] target/i386: kvm: just return after migrate_add_blocker failed Li Qiang
@ 2018-10-08 11:12 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Dr. David Alan Gilbert @ 2018-10-08 11:12 UTC (permalink / raw)
To: Li Qiang; +Cc: pbonzini, qemu-devel
* Li Qiang (liq3ea@163.com) wrote:
> 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>
> ---
> 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 0b2a07d3a4..6ba84a39f3 100644
> --- a/target/i386/kvm.c
> +++ b/target/i386/kvm.c
> @@ -1153,7 +1153,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;
So I think that's OK, however, I wonder if fail: should be
doing some more cleanup?
For example, I notice we've added cpu_update_state to the change state
handler's before that point, should that be removed?
Dave
> }
> /* for savevm */
> vmstate_x86_cpu.unmigratable = 1;
> --
> 2.17.1
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-08 11:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-06 9:18 [Qemu-devel] [PATCH] target/i386: kvm: just return after migrate_add_blocker failed Li Qiang
2018-10-08 11:12 ` Dr. David Alan Gilbert
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.