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

migration/block-dirty-bitmap: rename finish_lock to just lock 



finish_lock is bad name, as lock used not only on process end.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarAndrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200727194236.19551-13-vsementsov@virtuozzo.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 3b52726e

migration/block-dirty-bitmap.c

+6 −6
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ typedef struct DBMLoadState { 
    BdrvDirtyBitmap *bitmap;



    GSList *enabled_bitmaps;

    QemuMutex finish_lock;

    QemuMutex lock; /* protect enabled_bitmaps */

} DBMLoadState;



typedef struct DBMState {
@@ -575,7 +575,7 @@ void dirty_bitmap_mig_before_vm_start(void) 
    DBMLoadState *s = &dbm_state.load;

    GSList *item;



    qemu_mutex_lock(&s->finish_lock);

    qemu_mutex_lock(&s->lock);



    for (item = s->enabled_bitmaps; item; item = g_slist_next(item)) {

        LoadBitmapState *b = item->data;
@@ -592,7 +592,7 @@ void dirty_bitmap_mig_before_vm_start(void) 
    g_slist_free(s->enabled_bitmaps);

    s->enabled_bitmaps = NULL;



    qemu_mutex_unlock(&s->finish_lock);

    qemu_mutex_unlock(&s->lock);

}



static void dirty_bitmap_load_complete(QEMUFile *f, DBMLoadState *s)
@@ -601,7 +601,7 @@ static void dirty_bitmap_load_complete(QEMUFile *f, DBMLoadState *s) 
    trace_dirty_bitmap_load_complete();

    bdrv_dirty_bitmap_deserialize_finish(s->bitmap);



    qemu_mutex_lock(&s->finish_lock);

    qemu_mutex_lock(&s->lock);



    for (item = s->enabled_bitmaps; item; item = g_slist_next(item)) {

        LoadBitmapState *b = item->data;
@@ -633,7 +633,7 @@ static void dirty_bitmap_load_complete(QEMUFile *f, DBMLoadState *s) 
        bdrv_dirty_bitmap_unlock(s->bitmap);

    }



    qemu_mutex_unlock(&s->finish_lock);

    qemu_mutex_unlock(&s->lock);

}



static int dirty_bitmap_load_bits(QEMUFile *f, DBMLoadState *s)
@@ -815,7 +815,7 @@ static SaveVMHandlers savevm_dirty_bitmap_handlers = { 
void dirty_bitmap_mig_init(void)

{

    QSIMPLEQ_INIT(&dbm_state.save.dbms_list);

    qemu_mutex_init(&dbm_state.load.finish_lock);

    qemu_mutex_init(&dbm_state.load.lock);



    register_savevm_live("dirty-bitmap", 0, 1,

                         &savevm_dirty_bitmap_handlers,