* [Qemu-devel] [PATCH] bitmaps: Fix typo in function name
@ 2019-03-08 20:58 Eric Blake
2019-03-08 21:22 ` John Snow
0 siblings, 1 reply; 2+ messages in thread
From: Eric Blake @ 2019-03-08 20:58 UTC (permalink / raw)
To: qemu-devel
Cc: jsnow, vsementsov, qemu-block, Fam Zheng, Kevin Wolf, Max Reitz,
Markus Armbruster, Stefan Hajnoczi, Juan Quintela,
Dr. David Alan Gilbert
Commit a88b179f introduced the ability to set and query bitmap
persistence, but with an atypical spelling.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
Based-on: <20190308202858.26636-1-jsnow@redhat.com>
[PULL 00/17 Bitmaps patches]
(Don't know if John wants to do a v2 pull request to silence some
checkpatch warnings, in which case this could sneak in...)
include/block/dirty-bitmap.h | 4 ++--
block/dirty-bitmap.c | 4 ++--
block/qcow2-bitmap.c | 6 +++---
blockdev.c | 4 ++--
migration/block-dirty-bitmap.c | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 2a782439547..8044ace63e4 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -78,7 +78,7 @@ void bdrv_dirty_bitmap_deserialize_ones(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_persistance(BdrvDirtyBitmap *bitmap,
+void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap,
bool persistent);
void bdrv_dirty_bitmap_set_inconsistent(BdrvDirtyBitmap *bitmap);
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_has_readonly_bitmaps(BlockDriverState *bs);
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_has_changed_persistent_bitmaps(BlockDriverState *bs);
BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 59c403c3fd5..b08d4ec69ee 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -739,7 +739,7 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs)
}
/* 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);
bitmap->persistent = persistent;
@@ -764,7 +764,7 @@ void bdrv_dirty_bitmap_set_migration(BdrvDirtyBitmap *bitmap, bool migration)
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;
}
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 80926966de2..6adbe06b4d2 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -968,7 +968,7 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp)
goto fail;
}
- bdrv_dirty_bitmap_set_persistance(bitmap, true);
+ bdrv_dirty_bitmap_set_persistence(bitmap, true);
if (bm->flags & BME_FLAG_IN_USE) {
bdrv_dirty_bitmap_set_inconsistent(bitmap);
} else {
@@ -1426,7 +1426,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)
uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap);
Qcow2Bitmap *bm;
- if (!bdrv_dirty_bitmap_get_persistance(bitmap) ||
+ if (!bdrv_dirty_bitmap_get_persistence(bitmap) ||
bdrv_dirty_bitmap_readonly(bitmap) ||
bdrv_dirty_bitmap_inconsistent(bitmap)) {
continue;
@@ -1544,7 +1544,7 @@ int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp)
for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap != NULL;
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);
}
}
diff --git a/blockdev.c b/blockdev.c
index 51fcfb7faf1..267debda336 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2862,7 +2862,7 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
bdrv_disable_dirty_bitmap(bitmap);
}
- bdrv_dirty_bitmap_set_persistance(bitmap, persistent);
+ bdrv_dirty_bitmap_set_persistence(bitmap, persistent);
out:
if (aio_context) {
aio_context_release(aio_context);
@@ -2887,7 +2887,7 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name,
return;
}
- if (bdrv_dirty_bitmap_get_persistance(bitmap)) {
+ if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);
bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err);
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 0fcf897f329..ac095dae0f5 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -320,7 +320,7 @@ static int init_dirty_bitmap_migration(void)
if (bdrv_dirty_bitmap_enabled(bitmap)) {
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;
}
@@ -472,7 +472,7 @@ static int dirty_bitmap_load_start(QEMUFile *f, DirtyBitmapLoadState *s)
}
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);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] bitmaps: Fix typo in function name
2019-03-08 20:58 [Qemu-devel] [PATCH] bitmaps: Fix typo in function name Eric Blake
@ 2019-03-08 21:22 ` John Snow
0 siblings, 0 replies; 2+ messages in thread
From: John Snow @ 2019-03-08 21:22 UTC (permalink / raw)
To: Eric Blake, qemu-devel
Cc: Fam Zheng, Kevin Wolf, vsementsov, qemu-block, Juan Quintela,
Markus Armbruster, Max Reitz, Stefan Hajnoczi,
Dr. David Alan Gilbert
On 3/8/19 3:58 PM, Eric Blake wrote:
> Commit a88b179f introduced the ability to set and query bitmap
> persistence, but with an atypical spelling.
>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>
> Based-on: <20190308202858.26636-1-jsnow@redhat.com>
> [PULL 00/17 Bitmaps patches]
> (Don't know if John wants to do a v2 pull request to silence some
> checkpatch warnings, in which case this could sneak in...)
>
Yes, I'll take it. Staged.
--js
> include/block/dirty-bitmap.h | 4 ++--
> block/dirty-bitmap.c | 4 ++--
> block/qcow2-bitmap.c | 6 +++---
> blockdev.c | 4 ++--
> migration/block-dirty-bitmap.c | 4 ++--
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
> index 2a782439547..8044ace63e4 100644
> --- a/include/block/dirty-bitmap.h
> +++ b/include/block/dirty-bitmap.h
> @@ -78,7 +78,7 @@ void bdrv_dirty_bitmap_deserialize_ones(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_persistance(BdrvDirtyBitmap *bitmap,
> +void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap,
> bool persistent);
> void bdrv_dirty_bitmap_set_inconsistent(BdrvDirtyBitmap *bitmap);
> 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_has_readonly_bitmaps(BlockDriverState *bs);
> 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_has_changed_persistent_bitmaps(BlockDriverState *bs);
> BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,
> diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
> index 59c403c3fd5..b08d4ec69ee 100644
> --- a/block/dirty-bitmap.c
> +++ b/block/dirty-bitmap.c
> @@ -739,7 +739,7 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs)
> }
>
> /* 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);
> bitmap->persistent = persistent;
> @@ -764,7 +764,7 @@ void bdrv_dirty_bitmap_set_migration(BdrvDirtyBitmap *bitmap, bool migration)
> 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;
> }
> diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
> index 80926966de2..6adbe06b4d2 100644
> --- a/block/qcow2-bitmap.c
> +++ b/block/qcow2-bitmap.c
> @@ -968,7 +968,7 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp)
> goto fail;
> }
>
> - bdrv_dirty_bitmap_set_persistance(bitmap, true);
> + bdrv_dirty_bitmap_set_persistence(bitmap, true);
> if (bm->flags & BME_FLAG_IN_USE) {
> bdrv_dirty_bitmap_set_inconsistent(bitmap);
> } else {
> @@ -1426,7 +1426,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)
> uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap);
> Qcow2Bitmap *bm;
>
> - if (!bdrv_dirty_bitmap_get_persistance(bitmap) ||
> + if (!bdrv_dirty_bitmap_get_persistence(bitmap) ||
> bdrv_dirty_bitmap_readonly(bitmap) ||
> bdrv_dirty_bitmap_inconsistent(bitmap)) {
> continue;
> @@ -1544,7 +1544,7 @@ int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp)
> for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap != NULL;
> 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);
> }
> }
> diff --git a/blockdev.c b/blockdev.c
> index 51fcfb7faf1..267debda336 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -2862,7 +2862,7 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
> bdrv_disable_dirty_bitmap(bitmap);
> }
>
> - bdrv_dirty_bitmap_set_persistance(bitmap, persistent);
> + bdrv_dirty_bitmap_set_persistence(bitmap, persistent);
> out:
> if (aio_context) {
> aio_context_release(aio_context);
> @@ -2887,7 +2887,7 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name,
> return;
> }
>
> - if (bdrv_dirty_bitmap_get_persistance(bitmap)) {
> + if (bdrv_dirty_bitmap_get_persistence(bitmap)) {
> aio_context = bdrv_get_aio_context(bs);
> aio_context_acquire(aio_context);
> bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err);
> diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
> index 0fcf897f329..ac095dae0f5 100644
> --- a/migration/block-dirty-bitmap.c
> +++ b/migration/block-dirty-bitmap.c
> @@ -320,7 +320,7 @@ static int init_dirty_bitmap_migration(void)
> if (bdrv_dirty_bitmap_enabled(bitmap)) {
> 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;
> }
>
> @@ -472,7 +472,7 @@ static int dirty_bitmap_load_start(QEMUFile *f, DirtyBitmapLoadState *s)
> }
>
> 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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-08 21:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-08 20:58 [Qemu-devel] [PATCH] bitmaps: Fix typo in function name Eric Blake
2019-03-08 21:22 ` John Snow
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).