From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGlV-00008q-4k for qemu-devel@nongnu.org; Mon, 14 May 2018 12:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIGlU-00068y-IR for qemu-devel@nongnu.org; Mon, 14 May 2018 12:56:01 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:41043) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIGlU-00068d-Cx for qemu-devel@nongnu.org; Mon, 14 May 2018 12:56:00 -0400 Received: by mail-pl0-x241.google.com with SMTP id az12-v6so7706119plb.8 for ; Mon, 14 May 2018 09:56:00 -0700 (PDT) From: Zhang Chen Date: Tue, 15 May 2018 00:54:24 +0800 Message-Id: <20180514165424.12884-18-zhangckid@gmail.com> In-Reply-To: <20180514165424.12884-1-zhangckid@gmail.com> References: <20180514165424.12884-1-zhangckid@gmail.com> Subject: [Qemu-devel] [PATCH V7 RESEND 17/17] COLO: quick failover process by kick COLO thread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Blake , Markus Armbruster , Paolo Bonzini , Zhang Chen , "Dr . David Alan Gilbert" , Jason Wang , zhanghailiang From: zhanghailiang COLO thread may sleep at qemu_sem_wait(&s->colo_checkpoint_sem), while failover works begin, It's better to wakeup it to quick the process. Signed-off-by: zhanghailiang --- migration/colo.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 15463e2823..16def4865c 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -135,6 +135,11 @@ static void primary_vm_do_failover(void) migrate_set_state(&s->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); + /* + * kick COLO thread which might wait at + * qemu_sem_wait(&s->colo_checkpoint_sem). + */ + colo_checkpoint_notify(migrate_get_current()); /* * Wake up COLO thread which may blocked in recv() or send(), @@ -552,6 +557,9 @@ static void colo_process_checkpoint(MigrationState *s) qemu_sem_wait(&s->colo_checkpoint_sem); + if (s->state != MIGRATION_STATUS_COLO) { + goto out; + } ret = colo_do_checkpoint_transaction(s, bioc, fb); if (ret < 0) { goto out; -- 2.17.0