Commit ef893b5c authored by Eric Blake's avatar Eric Blake
Browse files

block: Make it easier to learn which BDS support bitmaps 



Upcoming patches will enhance bitmap support in qemu-img, but in doing
so, it turns out to be nice to suppress output when persistent bitmaps
make no sense (such as on a qcow2 v2 image).  Add a hook to make this
easier to query.

This patch adds a new callback .bdrv_supports_persistent_dirty_bitmap,
rather than trying to shoehorn the answer in via existing callbacks.
In particular, while it might have been possible to overload
.bdrv_co_can_store_new_dirty_bitmap to special-case a NULL input to
answer whether any persistent bitmaps are supported, that is at odds
with whether a particular bitmap can be stored (for example, even on
an image that supports persistent bitmaps but has currently filled up
the maximum number of bitmaps, attempts to store another one should
fail); and the new functionality doesn't require coroutine safety.
Similarly, we could have added one more piece of information to
.bdrv_get_info, but then again, most callers to that function tend to
already discard extraneous information, and making it a catch-all
rather than a series of dedicated scalar queries hasn't really
simplified life.

In the future, when we improve the ability to look up bitmaps through
a filter, we will probably also want to teach the block layer to
automatically let filters pass this request on through.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200513011648.166876-4-eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
parent 0562adf5

block/dirty-bitmap.c

+9 −0
Original line number Diff line number Diff line
@@ -478,6 +478,15 @@ int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *name, 
    }

}



bool

bdrv_supports_persistent_dirty_bitmap(BlockDriverState *bs)

{

    if (bs->drv && bs->drv->bdrv_supports_persistent_dirty_bitmap) {

        return bs->drv->bdrv_supports_persistent_dirty_bitmap(bs);

    }

    return false;

}



static bool coroutine_fn

bdrv_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,

                                   uint32_t granularity, Error **errp)

block/qcow2-bitmap.c

+7 −0
Original line number Diff line number Diff line
@@ -1748,3 +1748,10 @@ fail: 
                  name, bdrv_get_device_or_node_name(bs));

    return false;

}



bool qcow2_supports_persistent_dirty_bitmap(BlockDriverState *bs)

{

    BDRVQcow2State *s = bs->opaque;



    return s->qcow_version >= 3;

}

block/qcow2.c

+2 −0
Original line number Diff line number Diff line
@@ -5791,6 +5791,8 @@ BlockDriver bdrv_qcow2 = { 
    .bdrv_detach_aio_context  = qcow2_detach_aio_context,

    .bdrv_attach_aio_context  = qcow2_attach_aio_context,



    .bdrv_supports_persistent_dirty_bitmap =

            qcow2_supports_persistent_dirty_bitmap,

    .bdrv_co_can_store_new_dirty_bitmap = qcow2_co_can_store_new_dirty_bitmap,

    .bdrv_co_remove_persistent_dirty_bitmap =

            qcow2_co_remove_persistent_dirty_bitmap,

block/qcow2.h

+1 −0
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ bool qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, 
int qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs,

                                            const char *name,

                                            Error **errp);

bool qcow2_supports_persistent_dirty_bitmap(BlockDriverState *bs);



ssize_t coroutine_fn

qcow2_co_compress(BlockDriverState *bs, void *dest, size_t dest_size,

include/block/block_int.h

+1 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ struct BlockDriver { 
                             uint64_t parent_perm, uint64_t parent_shared,

                             uint64_t *nperm, uint64_t *nshared);



    bool (*bdrv_supports_persistent_dirty_bitmap)(BlockDriverState *bs);

    bool (*bdrv_co_can_store_new_dirty_bitmap)(BlockDriverState *bs,

                                               const char *name,

                                               uint32_t granularity,