Skip to content

Commit aa505f8

Browse files
raolei-inteljuanquintela
authored andcommitted
Fixed qemu crash when guest power off in COLO mode
This patch fixes the following: qemu-system-x86_64: invalid runstate transition: 'shutdown' -> 'running' Aborted (core dumped) The gdb bt as following: 0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 1 0x00007faa3d613859 in __GI_abort () at abort.c:79 2 0x000055c5a21268fd in runstate_set (new_state=RUN_STATE_RUNNING) at vl.c:723 3 0x000055c5a1f8cae4 in vm_prepare_start () at /home/workspace/colo-qemu/cpus.c:2206 4 0x000055c5a1f8cb1b in vm_start () at /home/workspace/colo-qemu/cpus.c:2213 5 0x000055c5a2332bba in migration_iteration_finish (s=0x55c5a4658810) at migration/migration.c:3376 6 0x000055c5a2332f3b in migration_thread (opaque=0x55c5a4658810) at migration/migration.c:3527 7 0x000055c5a251d68a in qemu_thread_start (args=0x55c5a5491a70) at util/qemu-thread-posix.c:519 8 0x00007faa3d7e9609 in start_thread (arg=<optimized out>) at pthread_create.c:477 9 0x00007faa3d710293 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Signed-off-by: Lei Rao <[email protected]> Reviewed-by: Juan Quintela <[email protected]> Signed-off-by: Juan Quintela <[email protected]>
1 parent ae4c209 commit aa505f8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

migration/migration.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3626,7 +3626,9 @@ static void migration_iteration_finish(MigrationState *s)
36263626
case MIGRATION_STATUS_CANCELLED:
36273627
case MIGRATION_STATUS_CANCELLING:
36283628
if (s->vm_was_running) {
3629-
vm_start();
3629+
if (!runstate_check(RUN_STATE_SHUTDOWN)) {
3630+
vm_start();
3631+
}
36303632
} else {
36313633
if (runstate_check(RUN_STATE_FINISH_MIGRATE)) {
36323634
runstate_set(RUN_STATE_POSTMIGRATE);

0 commit comments

Comments
 (0)