From 0c8ba0a96a7d0cbf371f1a5fbee543e8b2cb2595 Mon Sep 17 00:00:00 2001

From: Eric Blake <eblake@redhat.com>

Date: Tue, 2 Jun 2020 02:34:13 +0100

Subject: [PATCH 08/26] blockdev: Promote several bitmap functions to

 non-static

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Eric Blake <eblake@redhat.com>

Message-id: <20200602023420.2133649-6-eblake@redhat.com>

Patchwork-id: 97077

O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 05/12] blockdev: Promote several bitmap functions to non-static

Bugzilla: 1779893 1779904

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

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

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

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

The next patch will split blockdev.c, which will require accessing

some previously-static functions from more than one .c file.  But part

of promoting a function to public is picking a naming scheme that does

not reek of exposing too many internals (two of the three functions

were named starting with 'do_').  To make future code motion easier,

perform the function rename and non-static promotion into its own

patch.

Signed-off-by: Eric Blake <eblake@redhat.com>

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

Message-Id: <20200513011648.166876-5-eblake@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

(cherry picked from commit c6996cf9a6c759c29919642be9a73ac64b38301b)

Signed-off-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 blockdev.c                | 47 +++++++++++++++++++----------------------------

 include/block/block_int.h | 12 ++++++++++++

 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/blockdev.c b/blockdev.c

index 86eb115..3958058 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -1262,10 +1262,10 @@ out_aio_context:

  *

  * @return: A bitmap object on success, or NULL on failure.

  */

-static BdrvDirtyBitmap *block_dirty_bitmap_lookup(const char *node,

-                                                  const char *name,

-                                                  BlockDriverState **pbs,

-                                                  Error **errp)

+BdrvDirtyBitmap *block_dirty_bitmap_lookup(const char *node,

+                                           const char *name,

+                                           BlockDriverState **pbs,

+                                           Error **errp)

 {

     BlockDriverState *bs;

     BdrvDirtyBitmap *bitmap;

@@ -2241,11 +2241,6 @@ static void block_dirty_bitmap_disable_abort(BlkActionState *common)

     }

 }

-static BdrvDirtyBitmap *do_block_dirty_bitmap_merge(

-        const char *node, const char *target,

-        BlockDirtyBitmapMergeSourceList *bitmaps,

-        HBitmap **backup, Error **errp);

-

 static void block_dirty_bitmap_merge_prepare(BlkActionState *common,

                                              Error **errp)

 {

@@ -2259,15 +2254,11 @@ static void block_dirty_bitmap_merge_prepare(BlkActionState *common,

     action = common->action->u.block_dirty_bitmap_merge.data;

-    state->bitmap = do_block_dirty_bitmap_merge(action->node, action->target,

-                                                action->bitmaps, &state->backup,

-                                                errp);

+    state->bitmap = block_dirty_bitmap_merge(action->node, action->target,

+                                             action->bitmaps, &state->backup,

+                                             errp);

 }

-static BdrvDirtyBitmap *do_block_dirty_bitmap_remove(

-        const char *node, const char *name, bool release,

-        BlockDriverState **bitmap_bs, Error **errp);

-

 static void block_dirty_bitmap_remove_prepare(BlkActionState *common,

                                               Error **errp)

 {

@@ -2281,8 +2272,8 @@ static void block_dirty_bitmap_remove_prepare(BlkActionState *common,

     action = common->action->u.block_dirty_bitmap_remove.data;

-    state->bitmap = do_block_dirty_bitmap_remove(action->node, action->name,

-                                                 false, &state->bs, errp);

+    state->bitmap = block_dirty_bitmap_remove(action->node, action->name,

+                                              false, &state->bs, errp);

     if (state->bitmap) {

         bdrv_dirty_bitmap_skip_store(state->bitmap, true);

         bdrv_dirty_bitmap_set_busy(state->bitmap, true);

@@ -3046,9 +3037,10 @@ out:

     aio_context_release(aio_context);

 }

-static BdrvDirtyBitmap *do_block_dirty_bitmap_remove(

-        const char *node, const char *name, bool release,

-        BlockDriverState **bitmap_bs, Error **errp)

+BdrvDirtyBitmap *block_dirty_bitmap_remove(const char *node, const char *name,

+                                           bool release,

+                                           BlockDriverState **bitmap_bs,

+                                           Error **errp)

 {

     BlockDriverState *bs;

     BdrvDirtyBitmap *bitmap;

@@ -3090,7 +3082,7 @@ static BdrvDirtyBitmap *do_block_dirty_bitmap_remove(

 void qmp_block_dirty_bitmap_remove(const char *node, const char *name,

                                    Error **errp)

 {

-    do_block_dirty_bitmap_remove(node, name, true, NULL, errp);

+    block_dirty_bitmap_remove(node, name, true, NULL, errp);

 }

 /**

@@ -3151,10 +3143,9 @@ void qmp_block_dirty_bitmap_disable(const char *node, const char *name,

     bdrv_disable_dirty_bitmap(bitmap);

 }

-static BdrvDirtyBitmap *do_block_dirty_bitmap_merge(

-        const char *node, const char *target,

-        BlockDirtyBitmapMergeSourceList *bitmaps,

-        HBitmap **backup, Error **errp)

+BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

+                                          BlockDirtyBitmapMergeSourceList *bms,

+                                          HBitmap **backup, Error **errp)

 {

     BlockDriverState *bs;

     BdrvDirtyBitmap *dst, *src, *anon;

@@ -3172,7 +3163,7 @@ static BdrvDirtyBitmap *do_block_dirty_bitmap_merge(

         return NULL;

     }

-    for (lst = bitmaps; lst; lst = lst->next) {

+    for (lst = bms; lst; lst = lst->next) {

         switch (lst->value->type) {

             const char *name, *node;

         case QTYPE_QSTRING:

@@ -3217,7 +3208,7 @@ void qmp_block_dirty_bitmap_merge(const char *node, const char *target,

                                   BlockDirtyBitmapMergeSourceList *bitmaps,

                                   Error **errp)

 {

-    do_block_dirty_bitmap_merge(node, target, bitmaps, NULL, errp);

+    block_dirty_bitmap_merge(node, target, bitmaps, NULL, errp);

 }

 BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node,

diff --git a/include/block/block_int.h b/include/block/block_int.h

index cc18e8d..876a83d 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -1341,4 +1341,16 @@ int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv,

                                             Error **errp);

 extern QemuOptsList bdrv_create_opts_simple;

+BdrvDirtyBitmap *block_dirty_bitmap_lookup(const char *node,

+                                           const char *name,

+                                           BlockDriverState **pbs,

+                                           Error **errp);

+BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

+                                          BlockDirtyBitmapMergeSourceList *bms,

+                                          HBitmap **backup, Error **errp);

+BdrvDirtyBitmap *block_dirty_bitmap_remove(const char *node, const char *name,

+                                           bool release,

+                                           BlockDriverState **bitmap_bs,

+                                           Error **errp);

+

 #endif /* BLOCK_INT_H */

-- 

1.8.3.1