[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/24] migration/block-dirty-bitmap: move mutex init to dirty_bitm
From: |
Eric Blake |
Subject: |
[PULL 11/24] migration/block-dirty-bitmap: move mutex init to dirty_bitmap_mig_init |
Date: |
Mon, 27 Jul 2020 15:55:30 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
No reasons to keep two public init functions.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200727194236.19551-11-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
migration/migration.h | 1 -
migration/block-dirty-bitmap.c | 6 +-----
migration/migration.c | 2 --
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/migration/migration.h b/migration/migration.h
index f617960522aa..ab20c756f549 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -335,7 +335,6 @@ void migrate_send_rp_recv_bitmap(MigrationIncomingState
*mis,
void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
void dirty_bitmap_mig_before_vm_start(void);
-void init_dirty_bitmap_incoming_migration(void);
void migrate_add_address(SocketAddress *address);
int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque);
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 01a536d7d3d3..4b67e4f4fbcd 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -148,11 +148,6 @@ typedef struct LoadBitmapState {
static GSList *enabled_bitmaps;
QemuMutex finish_lock;
-void init_dirty_bitmap_incoming_migration(void)
-{
- qemu_mutex_init(&finish_lock);
-}
-
static uint32_t qemu_get_bitmap_flags(QEMUFile *f)
{
uint8_t flags = qemu_get_byte(f);
@@ -801,6 +796,7 @@ static SaveVMHandlers savevm_dirty_bitmap_handlers = {
void dirty_bitmap_mig_init(void)
{
QSIMPLEQ_INIT(&dirty_bitmap_mig_state.dbms_list);
+ qemu_mutex_init(&finish_lock);
register_savevm_live("dirty-bitmap", 0, 1,
&savevm_dirty_bitmap_handlers,
diff --git a/migration/migration.c b/migration/migration.c
index 2ed99232272e..1c61428988e9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -165,8 +165,6 @@ void migration_object_init(void)
qemu_sem_init(¤t_incoming->postcopy_pause_sem_dst, 0);
qemu_sem_init(¤t_incoming->postcopy_pause_sem_fault, 0);
- init_dirty_bitmap_incoming_migration();
-
if (!migration_object_check(current_migration, &err)) {
error_report_err(err);
exit(1);
--
2.27.0
- [PULL 00/24] bitmaps patches for -rc2, 2020-07-27, Eric Blake, 2020/07/27
- [PULL 01/24] qcow2: Fix capitalization of header extension constant., Eric Blake, 2020/07/27
- [PULL 03/24] qemu-iotests/199: drop extra constraints, Eric Blake, 2020/07/27
- [PULL 02/24] qemu-iotests/199: fix style, Eric Blake, 2020/07/27
- [PULL 04/24] qemu-iotests/199: better catch postcopy time, Eric Blake, 2020/07/27
- [PULL 05/24] qemu-iotests/199: improve performance: set bitmap by discard, Eric Blake, 2020/07/27
- [PULL 06/24] qemu-iotests/199: change discard patterns, Eric Blake, 2020/07/27
- [PULL 07/24] qemu-iotests/199: increase postcopy period, Eric Blake, 2020/07/27
- [PULL 08/24] migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start, Eric Blake, 2020/07/27
- [PULL 09/24] migration/block-dirty-bitmap: rename state structure types, Eric Blake, 2020/07/27
- [PULL 11/24] migration/block-dirty-bitmap: move mutex init to dirty_bitmap_mig_init,
Eric Blake <=
- [PULL 12/24] migration/block-dirty-bitmap: refactor state global variables, Eric Blake, 2020/07/27
- [PULL 10/24] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup, Eric Blake, 2020/07/27
- [PULL 15/24] migration/block-dirty-bitmap: keep bitmap state for all bitmaps, Eric Blake, 2020/07/27
- [PULL 14/24] migration/block-dirty-bitmap: simplify dirty_bitmap_load_complete, Eric Blake, 2020/07/27
- [PULL 13/24] migration/block-dirty-bitmap: rename finish_lock to just lock, Eric Blake, 2020/07/27
- [PULL 16/24] migration/block-dirty-bitmap: relax error handling in incoming part, Eric Blake, 2020/07/27
- [PULL 17/24] migration/block-dirty-bitmap: cancel migration on shutdown, Eric Blake, 2020/07/27
- [PULL 18/24] migration/savevm: don't worry if bitmap migration postcopy failed, Eric Blake, 2020/07/27
- [PULL 20/24] qemu-iotests/199: check persistent bitmaps, Eric Blake, 2020/07/27
- [PULL 22/24] qemu-iotests/199: add source-killed case to bitmaps postcopy, Eric Blake, 2020/07/27