[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/1] Revert "migration: Properly destroy variables on incoming sid
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 1/1] Revert "migration: Properly destroy variables on incoming side" |
Date: |
Mon, 28 Sep 2020 16:20:24 +0100 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
This reverts commit c02039a6f3730ddcf683a0ba9a175688c6db71a0.
This is breaking test 068 that does a loadvm twice.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 7 ++-----
1 file 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)
--
2.26.2