Commit d0cccbd1 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

migration/block-dirty-bitmap: move mutex init to dirty_bitmap_mig_init 



No reasons to keep two public init functions.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarAndrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200727194236.19551-11-vsementsov@virtuozzo.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent b25d3641

migration/block-dirty-bitmap.c

+1 −5
Original line number Diff line number Diff line
@@ -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,

migration/migration.c

+0 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ void migration_object_init(void) 
    qemu_sem_init(&current_incoming->postcopy_pause_sem_dst, 0);

    qemu_sem_init(&current_incoming->postcopy_pause_sem_fault, 0);



    init_dirty_bitmap_incoming_migration();



    if (!migration_object_check(current_migration, &err)) {

        error_report_err(err);

        exit(1);

migration/migration.h

+0 −1
Original line number Diff line number Diff line
@@ -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);