[14/14] migration: Initialize and cleanup decompression in migration.c

Commit Message

Lukas Straub April 2, 2023, 5:56 p.m. UTC

This fixes compress with colo.

Signed-off-by: Lukas Straub <[e-mail]>
---
 migration/migration.c | 9 +++++++++
 migration/ram.c       | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

--
2.30.2

Patch

diff --git a/migration/migration.c b/migration/migration.c
index ae2025d9d8..cbdc10b840 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"
@@ -316,6 +317,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 */
@@ -598,6 +600,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);
@@ -663,6 +671,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 9072d70f7c..e9a295fab9 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3559,10 +3559,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();

@@ -3578,7 +3574,6 @@  static int ram_load_cleanup(void *opaque)
     }

     xbzrle_load_cleanup();
-    compress_threads_load_cleanup();

     RAMBLOCK_FOREACH_NOT_IGNORED(rb) {
         g_free(rb->receivedmap);