mirror of https://github.com/xemu-project/xemu.git
Fixed a QEMU hang when guest poweroff in COLO mode
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>
This commit is contained in:
parent
0e0f0479e2
commit
795969ab1f
|
@ -37,4 +37,5 @@ COLOMode get_colo_mode(void);
|
||||||
void colo_do_failover(void);
|
void colo_do_failover(void);
|
||||||
|
|
||||||
void colo_checkpoint_notify(void *opaque);
|
void colo_checkpoint_notify(void *opaque);
|
||||||
|
void colo_shutdown(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -819,6 +819,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)
|
void *colo_process_incoming_thread(void *opaque)
|
||||||
{
|
{
|
||||||
MigrationIncomingState *mis = opaque;
|
MigrationIncomingState *mis = opaque;
|
||||||
|
|
|
@ -225,6 +225,12 @@ void migration_cancel(const Error *error)
|
||||||
|
|
||||||
void migration_shutdown(void)
|
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)
|
* Cancel the current migration - that will (eventually)
|
||||||
* stop the migration using this structure
|
* stop the migration using this structure
|
||||||
|
|
Loading…
Reference in New Issue