From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL v2 05/13] migration: process_incoming_migration_co(): rework error reporting
Date: Wed, 8 May 2024 20:35:33 -0300 [thread overview]
Message-ID: <20240508233541.2403-6-farosas@suse.de> (raw)
In-Reply-To: <20240508233541.2403-1-farosas@suse.de>
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Unify error reporting in the function. This simplifies the following
commit, which will not-exit-on-error behavior variant to the function.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
migration/migration.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index b307a4bc59..a9599838e6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -735,14 +735,16 @@ static void process_incoming_migration_bh(void *opaque)
static void coroutine_fn
process_incoming_migration_co(void *opaque)
{
+ MigrationState *s = migrate_get_current();
MigrationIncomingState *mis = migration_incoming_get_current();
PostcopyState ps;
int ret;
+ Error *local_err = NULL;
assert(mis->from_src_file);
if (compress_threads_load_setup(mis->from_src_file)) {
- error_report("Failed to setup decompress threads");
+ error_setg(&local_err, "Failed to setup decompress threads");
goto fail;
}
@@ -779,19 +781,12 @@ process_incoming_migration_co(void *opaque)
}
if (ret < 0) {
- MigrationState *s = migrate_get_current();
-
- if (migrate_has_error(s)) {
- WITH_QEMU_LOCK_GUARD(&s->error_mutex) {
- error_report_err(s->error);
- s->error = NULL;
- }
- }
- error_report("load of migration failed: %s", strerror(-ret));
+ error_setg(&local_err, "load of migration failed: %s", strerror(-ret));
goto fail;
}
if (colo_incoming_co() < 0) {
+ error_setg(&local_err, "colo incoming failed");
goto fail;
}
@@ -800,8 +795,16 @@ process_incoming_migration_co(void *opaque)
fail:
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_FAILED);
+ migrate_set_error(s, local_err);
+ error_free(local_err);
+
migration_incoming_state_destroy();
+ WITH_QEMU_LOCK_GUARD(&s->error_mutex) {
+ error_report_err(s->error);
+ s->error = NULL;
+ }
+
exit(EXIT_FAILURE);
}
--
2.35.3
next prev parent reply other threads:[~2024-05-08 23:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 23:35 [PULL v2 00/13] Migration patches for 2024-05-08 Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 01/13] migration/ram.c: API Conversion qemu_mutex_lock(), and qemu_mutex_unlock() to WITH_QEMU_LOCK_GUARD macro Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 02/13] migration: move trace-point from migrate_fd_error to migrate_set_error Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 03/13] migration: process_incoming_migration_co(): complete cleanup on failure Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 04/13] migration: process_incoming_migration_co(): fix reporting s->error Fabiano Rosas
2024-05-08 23:35 ` Fabiano Rosas [this message]
2024-05-08 23:35 ` [PULL v2 06/13] qapi: introduce exit-on-error parameter for migrate-incoming Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 07/13] migration: Remove 'skipped' field from MigrationStats Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 08/13] migration: Remove 'inc' option from migrate command Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 09/13] migration: Remove 'blk/-b' option from migrate commands Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 10/13] migration: Remove block migration Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 11/13] migration: Remove non-multifd compression Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 12/13] migration: Deprecate fd: for file migration Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 13/13] hmp/migration: Fix "migrate" command's documentation Fabiano Rosas
2024-05-10 5:38 ` [PULL v2 00/13] Migration patches for 2024-05-08 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=20240508233541.2403-6-farosas@suse.de \
--to=farosas@suse.de \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=vsementsov@yandex-team.ru \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).