From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PATCH v3 4/9] migration: Fix hang after error in destination setup phase
Date: Thu, 13 Feb 2025 14:59:22 -0300 [thread overview]
Message-ID: <20250213175927.19642-5-farosas@suse.de> (raw)
In-Reply-To: <20250213175927.19642-1-farosas@suse.de>
If the destination side fails at migration_ioc_process_incoming()
before starting the coroutine, it will report the error but QEMU will
not exit.
Set the migration state to FAILED and exit the process if
exit-on-error allows.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2633
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
migration/channel.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/migration/channel.c b/migration/channel.c
index 24a91ef911..a547b1fbfe 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -33,6 +33,7 @@
void migration_channel_process_incoming(QIOChannel *ioc)
{
MigrationState *s = migrate_get_current();
+ MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
trace_migration_set_incoming_channel(
@@ -47,6 +48,10 @@ void migration_channel_process_incoming(QIOChannel *ioc)
if (local_err) {
error_report_err(local_err);
+ migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED);
+ if (mis->exit_on_error) {
+ exit(EXIT_FAILURE);
+ }
}
}
--
2.35.3
next prev parent reply other threads:[~2025-02-13 18:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 17:59 [PATCH v3 0/9] migration: Fix issues during qmp_migrate_cancel Fabiano Rosas
2025-02-13 17:59 ` [PATCH v3 1/9] migration: Set migration error outside of migrate_cancel Fabiano Rosas
2025-02-13 17:59 ` [PATCH v3 2/9] migration: Unify migration_cancel and migrate_fd_cancel Fabiano Rosas
2025-02-13 17:59 ` [PATCH v3 3/9] migration: Change migrate_fd_ to migration_ Fabiano Rosas
2025-02-13 20:59 ` Peter Xu
2025-02-18 7:54 ` Zhijian Li (Fujitsu) via
2025-02-13 17:59 ` Fabiano Rosas [this message]
2025-02-13 17:59 ` [PATCH v3 5/9] migration: Reject qmp_migrate_cancel after postcopy Fabiano Rosas
2025-02-13 17:59 ` [PATCH v3 6/9] migration: Don't set FAILED state when cancelling Fabiano Rosas
2025-02-13 21:04 ` Peter Xu
2025-02-14 12:25 ` Fabiano Rosas
2025-02-14 15:13 ` Peter Xu
2025-02-13 17:59 ` [PATCH v3 7/9] tests/qtest/migration: Introduce migration_test_add_suffix Fabiano Rosas
2025-02-13 17:59 ` [PATCH v3 8/9] tests/qtest/migration: Add a cancel test Fabiano Rosas
2025-02-13 17:59 ` [PATCH v3 9/9] migration: Update migrate_cancel documentation Fabiano Rosas
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=20250213175927.19642-5-farosas@suse.de \
--to=farosas@suse.de \
--cc=berrange@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).