[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/10] migration: Fix early failure cleanup
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 04/10] migration: Fix early failure cleanup |
Date: |
Wed, 14 Feb 2018 15:39:32 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
Avoid crash in cleanup after a very early migration failure
(possibly due to my 688a3dcba980bf01344a 'Route errors down ...')
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/ram.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 8333d8e35e..7095c1040e 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1602,11 +1602,13 @@ static void xbzrle_load_cleanup(void)
static void ram_state_cleanup(RAMState **rsp)
{
- migration_page_queue_free(*rsp);
- qemu_mutex_destroy(&(*rsp)->bitmap_mutex);
- qemu_mutex_destroy(&(*rsp)->src_page_req_mutex);
- g_free(*rsp);
- *rsp = NULL;
+ if (*rsp) {
+ migration_page_queue_free(*rsp);
+ qemu_mutex_destroy(&(*rsp)->bitmap_mutex);
+ qemu_mutex_destroy(&(*rsp)->src_page_req_mutex);
+ g_free(*rsp);
+ *rsp = NULL;
+ }
}
static void xbzrle_cleanup(void)
--
2.14.3
- [Qemu-devel] [PULL 00/10] migration queue, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 01/10] migration/xen: Check return value of qemu_fclose, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 04/10] migration: Fix early failure cleanup,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 07/10] migration: reuse mis->userfault_quit_fd, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 09/10] migration: allow send_rq to fail, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 05/10] tests/migration: Add test for migration to bad destination, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 02/10] migration: improve documentation of postcopy-ram, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 06/10] migration: better error handling with QEMUFile, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 03/10] tests/migration: Add source to PC boot block, Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 10/10] migration: pass MigrationState to migrate_init(), Dr. David Alan Gilbert (git), 2018/02/14
- [Qemu-devel] [PULL 08/10] migration: provide postcopy_fault_thread_notify(), Dr. David Alan Gilbert (git), 2018/02/14
- Re: [Qemu-devel] [PULL 00/10] migration queue, Peter Maydell, 2018/02/15