From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
Peter Xu <peterx@redhat.com>
Subject: [PULL 03/13] migration: process_incoming_migration_co(): complete cleanup on failure
Date: Thu, 2 May 2024 17:23:06 -0300 [thread overview]
Message-ID: <20240502202316.29924-4-farosas@suse.de> (raw)
In-Reply-To: <20240502202316.29924-1-farosas@suse.de>
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Make call to migration_incoming_state_destroy(), instead of doing only
partial of it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
migration/migration.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 2dc6a063e9..0d26db47f7 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -799,10 +799,7 @@ process_incoming_migration_co(void *opaque)
fail:
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_FAILED);
- qemu_fclose(mis->from_src_file);
-
- multifd_recv_cleanup();
- compress_threads_load_cleanup();
+ migration_incoming_state_destroy();
exit(EXIT_FAILURE);
}
--
2.35.3
next prev parent reply other threads:[~2024-05-02 20:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 20:23 [PULL 00/13] Migration patches for 2024-05-02 Fabiano Rosas
2024-05-02 20:23 ` [PULL 01/13] migration/ram.c: API Conversion qemu_mutex_lock(), and qemu_mutex_unlock() to WITH_QEMU_LOCK_GUARD macro Fabiano Rosas
2024-05-02 20:23 ` [PULL 02/13] migration: move trace-point from migrate_fd_error to migrate_set_error Fabiano Rosas
2024-05-02 20:23 ` Fabiano Rosas [this message]
2024-05-02 20:23 ` [PULL 04/13] migration: process_incoming_migration_co(): fix reporting s->error Fabiano Rosas
2024-05-02 20:23 ` [PULL 05/13] migration: process_incoming_migration_co(): rework error reporting Fabiano Rosas
2024-05-02 20:23 ` [PULL 06/13] qapi: introduce exit-on-error parameter for migrate-incoming Fabiano Rosas
2024-05-02 20:23 ` [PULL 07/13] migration: Remove 'skipped' field from MigrationStats Fabiano Rosas
2024-05-02 20:23 ` [PULL 08/13] migration: Remove 'inc' option from migrate command Fabiano Rosas
2024-05-02 20:23 ` [PULL 09/13] migration: Remove 'blk/-b' option from migrate commands Fabiano Rosas
2024-05-02 20:23 ` [PULL 10/13] migration: Remove block migration Fabiano Rosas
2024-05-02 20:23 ` [PULL 11/13] migration: Remove non-multifd compression Fabiano Rosas
2024-05-02 20:23 ` [PULL 12/13] migration: Deprecate fd: for file migration Fabiano Rosas
2024-05-02 20:23 ` [PULL 13/13] hmp/migration: Fix documents for "migrate" command Fabiano Rosas
2024-05-03 6:59 ` Markus Armbruster
2024-05-03 12:51 ` Fabiano Rosas
2024-05-03 13:10 ` 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=20240502202316.29924-4-farosas@suse.de \
--to=farosas@suse.de \
--cc=peterx@redhat.com \
--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).