bitmaps: Fix typo in function name
Commit a88b179f
introduced the ability to set and query bitmap
persistence, but with an atypical spelling.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-id: 20190308205845.25734-1-eblake@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
74da6b9435
commit
796a3798ab
|
@ -740,7 +740,7 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called with BQL taken. */
|
/* Called with BQL taken. */
|
||||||
void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap, bool persistent)
|
void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap, bool persistent)
|
||||||
{
|
{
|
||||||
qemu_mutex_lock(bitmap->mutex);
|
qemu_mutex_lock(bitmap->mutex);
|
||||||
bitmap->persistent = persistent;
|
bitmap->persistent = persistent;
|
||||||
|
@ -765,7 +765,7 @@ void bdrv_dirty_bitmap_set_migration(BdrvDirtyBitmap *bitmap, bool migration)
|
||||||
qemu_mutex_unlock(bitmap->mutex);
|
qemu_mutex_unlock(bitmap->mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap)
|
bool bdrv_dirty_bitmap_get_persistence(BdrvDirtyBitmap *bitmap)
|
||||||
{
|
{
|
||||||
return bitmap->persistent && !bitmap->migration;
|
return bitmap->persistent && !bitmap->migration;
|
||||||
}
|
}
|
||||||
|
|
|
@ -969,7 +969,7 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp)
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
bdrv_dirty_bitmap_set_persistance(bitmap, true);
|
bdrv_dirty_bitmap_set_persistence(bitmap, true);
|
||||||
if (bm->flags & BME_FLAG_IN_USE) {
|
if (bm->flags & BME_FLAG_IN_USE) {
|
||||||
bdrv_dirty_bitmap_set_inconsistent(bitmap);
|
bdrv_dirty_bitmap_set_inconsistent(bitmap);
|
||||||
} else {
|
} else {
|
||||||
|
@ -1427,7 +1427,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)
|
||||||
uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap);
|
uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap);
|
||||||
Qcow2Bitmap *bm;
|
Qcow2Bitmap *bm;
|
||||||
|
|
||||||
if (!bdrv_dirty_bitmap_get_persistance(bitmap) ||
|
if (!bdrv_dirty_bitmap_get_persistence(bitmap) ||
|
||||||
bdrv_dirty_bitmap_readonly(bitmap) ||
|
bdrv_dirty_bitmap_readonly(bitmap) ||
|
||||||
bdrv_dirty_bitmap_inconsistent(bitmap)) {
|
bdrv_dirty_bitmap_inconsistent(bitmap)) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -1545,7 +1545,7 @@ int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp)
|
||||||
for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap != NULL;
|
for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap != NULL;
|
||||||
bitmap = bdrv_dirty_bitmap_next(bs, bitmap))
|
bitmap = bdrv_dirty_bitmap_next(bs, bitmap))
|
||||||
{
|
{
|
||||||
if (bdrv_dirty_bitmap_get_persistance(bitmap)) {
|
if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
|
||||||
bdrv_dirty_bitmap_set_readonly(bitmap, true);
|
bdrv_dirty_bitmap_set_readonly(bitmap, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2864,7 +2864,7 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
|
||||||
bdrv_disable_dirty_bitmap(bitmap);
|
bdrv_disable_dirty_bitmap(bitmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
bdrv_dirty_bitmap_set_persistance(bitmap, persistent);
|
bdrv_dirty_bitmap_set_persistence(bitmap, persistent);
|
||||||
out:
|
out:
|
||||||
if (aio_context) {
|
if (aio_context) {
|
||||||
aio_context_release(aio_context);
|
aio_context_release(aio_context);
|
||||||
|
@ -2889,7 +2889,7 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bdrv_dirty_bitmap_get_persistance(bitmap)) {
|
if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
|
||||||
aio_context = bdrv_get_aio_context(bs);
|
aio_context = bdrv_get_aio_context(bs);
|
||||||
aio_context_acquire(aio_context);
|
aio_context_acquire(aio_context);
|
||||||
bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err);
|
bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err);
|
||||||
|
|
|
@ -78,7 +78,7 @@ void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap,
|
||||||
void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap);
|
void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap);
|
||||||
|
|
||||||
void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value);
|
void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value);
|
||||||
void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap,
|
void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap,
|
||||||
bool persistent);
|
bool persistent);
|
||||||
void bdrv_dirty_bitmap_set_inconsistent(BdrvDirtyBitmap *bitmap);
|
void bdrv_dirty_bitmap_set_inconsistent(BdrvDirtyBitmap *bitmap);
|
||||||
void bdrv_dirty_bitmap_set_busy(BdrvDirtyBitmap *bitmap, bool busy);
|
void bdrv_dirty_bitmap_set_busy(BdrvDirtyBitmap *bitmap, bool busy);
|
||||||
|
@ -103,7 +103,7 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs, int64_t bytes);
|
||||||
bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap);
|
bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap);
|
||||||
bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);
|
bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);
|
||||||
bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap);
|
bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap);
|
||||||
bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap);
|
bool bdrv_dirty_bitmap_get_persistence(BdrvDirtyBitmap *bitmap);
|
||||||
bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap);
|
bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap);
|
||||||
bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs);
|
bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs);
|
||||||
BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,
|
BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,
|
||||||
|
|
|
@ -321,7 +321,7 @@ static int init_dirty_bitmap_migration(void)
|
||||||
if (bdrv_dirty_bitmap_enabled(bitmap)) {
|
if (bdrv_dirty_bitmap_enabled(bitmap)) {
|
||||||
dbms->flags |= DIRTY_BITMAP_MIG_START_FLAG_ENABLED;
|
dbms->flags |= DIRTY_BITMAP_MIG_START_FLAG_ENABLED;
|
||||||
}
|
}
|
||||||
if (bdrv_dirty_bitmap_get_persistance(bitmap)) {
|
if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
|
||||||
dbms->flags |= DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT;
|
dbms->flags |= DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -473,7 +473,7 @@ static int dirty_bitmap_load_start(QEMUFile *f, DirtyBitmapLoadState *s)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT) {
|
if (flags & DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT) {
|
||||||
bdrv_dirty_bitmap_set_persistance(s->bitmap, true);
|
bdrv_dirty_bitmap_set_persistence(s->bitmap, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
bdrv_disable_dirty_bitmap(s->bitmap);
|
bdrv_disable_dirty_bitmap(s->bitmap);
|
||||||
|
|
Loading…
Reference in New Issue