From e7e2710ac920bb8c62d0b4bb9b95700a087509b5 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Wed, 3 Apr 2019 18:18:56 +0200

Subject: [PATCH 151/163] bitmaps: Fix typo in function name

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <20190403181857.9693-21-jsnow@redhat.com>

Patchwork-id: 85430

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 20/21] bitmaps: Fix typo in function name

Bugzilla: 1677073

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>

From: Eric Blake <eblake@redhat.com>

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>

(cherry picked from commit 796a3798ab882ae78a8203acd335ded4e10e3afb)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/dirty-bitmap.c           | 4 ++--

 block/qcow2-bitmap.c           | 6 +++---

 blockdev.c                     | 4 ++--

 include/block/dirty-bitmap.h   | 4 ++--

 migration/block-dirty-bitmap.c | 4 ++--

 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c

index 2139354..59e6ebb 100644

--- a/block/dirty-bitmap.c

+++ b/block/dirty-bitmap.c

@@ -740,7 +740,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;

@@ -765,7 +765,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 cbab0e5..4d093da 100644

--- a/block/qcow2-bitmap.c

+++ b/block/qcow2-bitmap.c

@@ -970,7 +970,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 {

@@ -1428,7 +1428,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;

@@ -1546,7 +1546,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 e497939..61218b4 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -3014,7 +3014,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);

@@ -3039,7 +3039,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/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h

index 2a78243..8044ace 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/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c

index 06ab58d..3beac29 100644

--- a/migration/block-dirty-bitmap.c

+++ b/migration/block-dirty-bitmap.c

@@ -321,7 +321,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;

             }

@@ -473,7 +473,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);

-- 

1.8.3.1