84 lines
2.5 KiB
Diff
84 lines
2.5 KiB
Diff
From 6de250962994520ba8daca709cd4b3b54d5e3afb Mon Sep 17 00:00:00 2001
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 1 Dec 2023 10:47:48 +0800
|
|
Subject: [PATCH] Fixed a QEMU hang when guest poweroff in COLO mode
|
|
|
|
cherry picked from commit 795969ab1fe6d5a0f524be92e2e1ecd13f1873eb
|
|
|
|
When the PVM guest poweroff, the COLO thread may wait a semaphore
|
|
in colo_process_checkpoint().So, we should wake up the COLO thread
|
|
before migration shutdown.
|
|
|
|
Signed-off-by: Lei Rao <lei.rao@intel.com>
|
|
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
---
|
|
include/migration/colo.h | 1 +
|
|
migration/colo.c | 20 ++++++++++++++++++++
|
|
migration/migration.c | 6 ++++++
|
|
3 files changed, 27 insertions(+)
|
|
|
|
diff --git a/include/migration/colo.h b/include/migration/colo.h
|
|
index 768e1f04c3..5fbe1a6d5d 100644
|
|
--- a/include/migration/colo.h
|
|
+++ b/include/migration/colo.h
|
|
@@ -37,4 +37,5 @@ COLOMode get_colo_mode(void);
|
|
void colo_do_failover(void);
|
|
|
|
void colo_checkpoint_notify(void *opaque);
|
|
+void colo_shutdown(void);
|
|
#endif
|
|
diff --git a/migration/colo.c b/migration/colo.c
|
|
index 2415325262..0d3d98f707 100644
|
|
--- a/migration/colo.c
|
|
+++ b/migration/colo.c
|
|
@@ -820,6 +820,26 @@ static void colo_wait_handle_message(MigrationIncomingState *mis,
|
|
}
|
|
}
|
|
|
|
+void colo_shutdown(void)
|
|
+{
|
|
+ MigrationIncomingState *mis = NULL;
|
|
+ MigrationState *s = NULL;
|
|
+
|
|
+ switch (get_colo_mode()) {
|
|
+ case COLO_MODE_PRIMARY:
|
|
+ s = migrate_get_current();
|
|
+ qemu_event_set(&s->colo_checkpoint_event);
|
|
+ qemu_sem_post(&s->colo_exit_sem);
|
|
+ break;
|
|
+ case COLO_MODE_SECONDARY:
|
|
+ mis = migration_incoming_get_current();
|
|
+ qemu_sem_post(&mis->colo_incoming_sem);
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+}
|
|
+
|
|
void *colo_process_incoming_thread(void *opaque)
|
|
{
|
|
MigrationIncomingState *mis = opaque;
|
|
diff --git a/migration/migration.c b/migration/migration.c
|
|
index 2ec116f901..cceaacc7f7 100644
|
|
--- a/migration/migration.c
|
|
+++ b/migration/migration.c
|
|
@@ -226,6 +226,12 @@ void migration_cancel(const Error *error)
|
|
|
|
void migration_shutdown(void)
|
|
{
|
|
+ /*
|
|
+ * When the QEMU main thread exit, the COLO thread
|
|
+ * may wait a semaphore. So, we should wakeup the
|
|
+ * COLO thread before migration shutdown.
|
|
+ */
|
|
+ colo_shutdown();
|
|
/*
|
|
* Cancel the current migration - that will (eventually)
|
|
* stop the migration using this structure
|
|
--
|
|
2.27.0
|
|
|