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

raw-win32: 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.

In this case, raw_probe_alignment() already did what we needed,
so just fix its signature and wire it in correctly.

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 a84178cc

block/raw-win32.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void raw_attach_aio_context(BlockDriverState *bs, 
    }

}



static void raw_probe_alignment(BlockDriverState *bs)

static void raw_probe_alignment(BlockDriverState *bs, Error **errp)

{

    BDRVRawState *s = bs->opaque;

    DWORD sectorsPerCluster, freeClusters, totalClusters, count;
@@ -365,7 +365,6 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, 
        win32_aio_attach_aio_context(s->aio, bdrv_get_aio_context(bs));

    }



    raw_probe_alignment(bs);

    ret = 0;

fail:

    qemu_opts_del(opts);
@@ -550,6 +549,7 @@ BlockDriver bdrv_file = { 
    .bdrv_needs_filename = true,

    .bdrv_parse_filename = raw_parse_filename,

    .bdrv_file_open     = raw_open,

    .bdrv_refresh_limits = raw_probe_alignment,

    .bdrv_close         = raw_close,

    .bdrv_create        = raw_create,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,