Commit 79ba8c98 authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

block: Set default request_alignment during bdrv_refresh_limits() 



We want to eventually stick request_alignment alongside other
BlockLimits, but first, we must ensure it is populated at the
same time as all other limits, rather than being a special case
that is set only when a block is first opened.

Now that all drivers have been updated to supply an override
of request_alignment during their .bdrv_refresh_limits(), as
needed, the block layer itself can defer setting the default
alignment until part of the overall bdrv_refresh_limits().

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a6506481

block.c

+0 −1
Original line number Diff line number Diff line
@@ -937,7 +937,6 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, 
        goto fail_opts;

    }



    bs->request_alignment = drv->bdrv_co_preadv ? 1 : 512;

    bs->read_only = !(bs->open_flags & BDRV_O_RDWR);



    if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) {

block/io.c

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp) 
        return;

    }



    /* Default alignment based on whether driver has byte interface */

    bs->request_alignment = drv->bdrv_co_preadv ? 1 : 512;



    /* Take some limits from the children as a default */

    if (bs->file) {

        bdrv_refresh_limits(bs->file->bs, &local_err);