From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com>,
Li Zhijian <lizhijian@cn.fujitsu.com>,
Juan Quintela <quintela@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Zhang Chen <chen.zhang@intel.com>, "Rao, Lei" <lei.rao@intel.com>
Subject: [PULL 05/11] Fixed qemu crash when guest power off in COLO mode
Date: Wed, 3 Nov 2021 09:45:59 +0100 [thread overview]
Message-ID: <20211103084605.20027-6-quintela@redhat.com> (raw)
In-Reply-To: <20211103084605.20027-1-quintela@redhat.com>
From: "Rao, Lei" <lei.rao@intel.com>
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 <lei.rao@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index edc0dac80a..3fb856f6e1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3626,7 +3626,9 @@ static void migration_iteration_finish(MigrationState *s)
case MIGRATION_STATUS_CANCELLED:
case MIGRATION_STATUS_CANCELLING:
if (s->vm_was_running) {
- vm_start();
+ if (!runstate_check(RUN_STATE_SHUTDOWN)) {
+ vm_start();
+ }
} else {
if (runstate_check(RUN_STATE_FINISH_MIGRATE)) {
runstate_set(RUN_STATE_POSTMIGRATE);
--
2.33.1
next prev parent reply other threads:[~2021-11-03 8:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 8:45 [PULL 00/11] Migration 20211102 patches Juan Quintela
2021-11-03 8:45 ` [PULL 01/11] migration: provide an error message to migration_cancel() Juan Quintela
2021-11-03 8:45 ` [PULL 02/11] migration: initialise compression_counters for a new migration Juan Quintela
2021-11-03 8:45 ` [PULL 03/11] migration: Zero migration compression counters Juan Quintela
2021-11-03 8:45 ` [PULL 04/11] Some minor optimizations for COLO Juan Quintela
2021-11-03 8:45 ` Juan Quintela [this message]
2021-11-03 8:46 ` [PULL 06/11] Fixed SVM hang when do failover before PVM crash Juan Quintela
2021-11-03 8:46 ` [PULL 07/11] colo: fixed 'Segmentation fault' when the simplex mode PVM poweroff Juan Quintela
2021-11-03 8:46 ` [PULL 08/11] Removed the qemu_fclose() in colo_process_incoming_thread Juan Quintela
2021-11-03 8:46 ` [PULL 09/11] Changed the last-mode to none of first start COLO Juan Quintela
2021-11-03 8:46 ` [PULL 10/11] colo: Don't dump colo cache if dump-guest-core=off Juan Quintela
2021-11-03 8:46 ` [PULL 11/11] Optimized the function of fill_connection_key Juan Quintela
2021-11-03 15:06 ` Juan Quintela
2021-11-04 10:32 ` [PULL 00/11] Migration 20211102 patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211103084605.20027-6-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=chen.zhang@intel.com \
--cc=dgilbert@redhat.com \
--cc=jasowang@redhat.com \
--cc=lei.rao@intel.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=qemu-devel@nongnu.org \
--cc=zhang.zhanghailiang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).