OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8d16e72
)
Revert "migration: Properly destroy variables on incoming side"
author
Dr. David Alan Gilbert
<dgilbert@redhat.com>
Mon, 28 Sep 2020 14:48:30 +0000
(15:48 +0100)
committer
Dr. David Alan Gilbert
<dgilbert@redhat.com>
Mon, 28 Sep 2020 15:18:02 +0000
(16:18 +0100)
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
patch
|
blob
|
history
diff --git
a/migration/migration.c
b/migration/migration.c
index
838ca79
..
aca7fdc
100644
(file)
--- 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)