migration: Initialize and cleanup decompression in migration.c
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>
This commit is contained in:
parent
52623f23b0
commit
c323518a7a
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue