diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-29 10:29:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-29 10:29:46 +0100 |
| commit | 23290e8070fa18dd8ff930515326e76eeee5810a (patch) | |
| tree | 46313aa833315afb1f52a225711a385a7d4d76cd /migration | |
| parent | 1553d543ff4b9f91de4ed7743f0cd6e534528b9e (diff) | |
| parent | 1783c00fc998220f9ca13b7eeca1d610243bc11b (diff) | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200928a' into staging
Migration: Revert one patch for 068 fix
One patch in the last pull broke test 068 which
does a pair of vmload's.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Mon 28 Sep 2020 16:19:17 BST
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20200928a:
Revert "migration: Properly destroy variables on incoming side"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 7 |
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) |