[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/21] migration: Initialize and cleanup decompression in migratio
From: |
Juan Quintela |
Subject: |
[PULL 21/21] migration: Initialize and cleanup decompression in migration.c |
Date: |
Fri, 28 Apr 2023 21:12:03 +0200 |
From: Lukas Straub <lukasstraub2@web.de>
This fixes compress with colo.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 9 +++++++++
migration/ram.c | 5 -----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index feb5ab7493..11f5a2dd6f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -26,6 +26,7 @@
#include "sysemu/cpu-throttle.h"
#include "rdma.h"
#include "ram.h"
+#include "ram-compress.h"
#include "migration/global_state.h"
#include "migration/misc.h"
#include "migration.h"
@@ -228,6 +229,7 @@ void migration_incoming_state_destroy(void)
struct MigrationIncomingState *mis = migration_incoming_get_current();
multifd_load_cleanup();
+ compress_threads_load_cleanup();
if (mis->to_src_file) {
/* Tell source that we are done */
@@ -500,6 +502,12 @@ process_incoming_migration_co(void *opaque)
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");
+ goto fail;
+ }
+
mis->migration_incoming_co = qemu_coroutine_self();
mis->largest_page_size = qemu_ram_pagesize_largest();
postcopy_state_set(POSTCOPY_INCOMING_NONE);
@@ -565,6 +573,7 @@ fail:
qemu_fclose(mis->from_src_file);
multifd_load_cleanup();
+ compress_threads_load_cleanup();
exit(EXIT_FAILURE);
}
diff --git a/migration/ram.c b/migration/ram.c
index a5bd943cc6..1f664fa071 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3558,10 +3558,6 @@ void colo_release_ram_cache(void)
*/
static int ram_load_setup(QEMUFile *f, void *opaque)
{
- if (compress_threads_load_setup(f)) {
- return -1;
- }
-
xbzrle_load_setup();
ramblock_recv_map_init();
@@ -3577,7 +3573,6 @@ static int ram_load_cleanup(void *opaque)
}
xbzrle_load_cleanup();
- compress_threads_load_cleanup();
RAMBLOCK_FOREACH_NOT_IGNORED(rb) {
g_free(rb->receivedmap);
--
2.40.0
- [PULL 09/21] qtest/migration-test.c: Add tests with compress enabled, (continued)
- [PULL 09/21] qtest/migration-test.c: Add tests with compress enabled, Juan Quintela, 2023/04/28
- [PULL 11/21] ram.c: Let the compress threads return a CompressResult enum, Juan Quintela, 2023/04/28
- [PULL 14/21] ram.c: Do not call save_page_header() from compress threads, Juan Quintela, 2023/04/28
- [PULL 12/21] ram.c: Dont change param->block in the compress thread, Juan Quintela, 2023/04/28
- [PULL 13/21] ram.c: Reset result after sending queued data, Juan Quintela, 2023/04/28
- [PULL 16/21] ram.c: Remove last ram.c dependency from the core compress code, Juan Quintela, 2023/04/28
- [PULL 15/21] ram.c: Call update_compress_thread_counts from compress_send_queued_data, Juan Quintela, 2023/04/28
- [PULL 18/21] ram.c: Move core decompression code into its own file, Juan Quintela, 2023/04/28
- [PULL 19/21] ram compress: Assert that the file buffer matches the result, Juan Quintela, 2023/04/28
- [PULL 17/21] ram.c: Move core compression code into its own file, Juan Quintela, 2023/04/28
- [PULL 21/21] migration: Initialize and cleanup decompression in migration.c,
Juan Quintela <=
- [PULL 20/21] ram-compress.c: Make target independent, Juan Quintela, 2023/04/28
- Re: [PULL 00/21] Migration 20230428 patches, Richard Henderson, 2023/04/29