aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2020-09-28 15:48:30 +0100
committerDr. David Alan Gilbert <dgilbert@redhat.com>2020-09-28 16:18:02 +0100
commit1783c00fc998220f9ca13b7eeca1d610243bc11b (patch)
tree775c064d71a2ae83fcd6e9dc6a708798a21670b3 /migration
parent8d16e72f2d4df2c9e631393adf1669a1da7efe8a (diff)
Revert "migration: Properly destroy variables on incoming side"
This reverts commit c02039a6f3730ddcf683a0ba9a175688c6db71a0. This is breaking test 068 that does a loadvm twice. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 838ca79f57..aca7fdcd0b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -238,15 +238,12 @@ void migration_incoming_state_destroy(void)
mis->postcopy_remote_fds = NULL;
}
+ qemu_event_reset(&mis->main_thread_load_event);
+
if (mis->socket_address_list) {
qapi_free_SocketAddressList(mis->socket_address_list);
mis->socket_address_list = NULL;
}
-
- qemu_event_destroy(&mis->main_thread_load_event);
- qemu_sem_destroy(&mis->postcopy_pause_sem_dst);
- qemu_sem_destroy(&mis->postcopy_pause_sem_fault);
- qemu_mutex_destroy(&mis->rp_mutex);
}
static void migrate_generate_event(int new_state)