[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/21] migration: provide ram_state_cleanup
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 14/21] migration: provide ram_state_cleanup |
Date: |
Mon, 23 Oct 2017 18:07:53 +0200 |
From: Peter Xu <address@hidden>
There are two Mutexes that are created but not yet destroyed for
RAMState. Fix that.
Since we are at it, provide helper function to clean up RAMState.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 13f4b3d101..d91e8787ae 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1576,6 +1576,15 @@ static void xbzrle_load_cleanup(void)
XBZRLE.decoded_buf = NULL;
}
+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;
+}
+
static void ram_save_cleanup(void *opaque)
{
RAMState **rsp = opaque;
@@ -1605,10 +1614,8 @@ static void ram_save_cleanup(void *opaque)
XBZRLE.zero_target_page = NULL;
}
XBZRLE_cache_unlock();
- migration_page_queue_free(*rsp);
compress_threads_save_cleanup();
- g_free(*rsp);
- *rsp = NULL;
+ ram_state_cleanup(rsp);
}
static void ram_state_reset(RAMState *rs)
--
2.13.6
- [Qemu-devel] [PULL 02/21] migratiom: Remove max_item_age parameter, (continued)
- [Qemu-devel] [PULL 02/21] migratiom: Remove max_item_age parameter, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 05/21] migration: Make cache_init() take an error parameter, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 06/21] migration: Add 'pause-before-switchover' capability, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 08/21] migration: Wait for semaphore before completing migration, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 09/21] migration: migrate-continue, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 10/21] migrate: HMP migate_continue, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 07/21] migration: Add 'pre-switchover' and 'device' statuses, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 11/21] migration: allow cancel to unpause, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 12/21] migration: pause-before-switchover for postcopy, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 13/21] migration: provide ram_state_init(), Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 14/21] migration: provide ram_state_cleanup,
Juan Quintela <=
- [Qemu-devel] [PULL 15/21] migration: clean up xbzrle cache init/destroy, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 16/21] migration: new ram_init_bitmaps(), Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 17/21] migration: postcopy_place_page factoring out, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 20/21] qapi: Fix grammar in x-multifd-page-count descriptions, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 18/21] migration: introduce qemu_ufd_copy_ioctl helper, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 21/21] migration: Improve migration thread error handling, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 19/21] migration: add bitmap for received page, Juan Quintela, 2017/10/23
- Re: [Qemu-devel] [PULL 00/21] Migration pull request, Peter Maydell, 2017/10/25