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

qcow2: Set 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.

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 c8b3b998

block/qcow2.c

+4 −3
Original line number Diff line number Diff line
@@ -981,9 +981,6 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, 
        }



        bs->encrypted = 1;



        /* Encryption works on a sector granularity */

        bs->request_alignment = BDRV_SECTOR_SIZE;

    }



    s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */
@@ -1202,6 +1199,10 @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp) 
{

    BDRVQcow2State *s = bs->opaque;



    if (bs->encrypted) {

        /* Encryption works on a sector granularity */

        bs->request_alignment = BDRV_SECTOR_SIZE;

    }

    bs->bl.pwrite_zeroes_alignment = s->cluster_size;

}