Commit 3dd5b8f4 authored by Leonid Bloch's avatar Leonid Bloch Committed by Kevin Wolf
Browse files

vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE 



If an expression is used to define DEFAULT_CLUSTER_SIZE, when compiled,
it will be embedded as a literal expression in the binary (as the
default value) because it is stringified to mark the size of the default
value. Now this is fixed by using a defined number to define this value.

Signed-off-by: default avatarLeonid Bloch <lbloch@janustech.com>
Reviewed-by: default avatarStefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 679be303

block/vdi.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
#define BLOCK_OPT_STATIC "static"



#define SECTOR_SIZE 512

#define DEFAULT_CLUSTER_SIZE (1 * MiB)

#define DEFAULT_CLUSTER_SIZE S_1MiB



#if defined(CONFIG_VDI_DEBUG)

#define VDI_DEBUG 1
@@ -432,7 +432,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail;

    } else if (header.block_size != DEFAULT_CLUSTER_SIZE) {

        error_setg(errp, "unsupported VDI image (block size %" PRIu32

                         " is not %" PRIu64 ")",

                         " is not %" PRIu32 ")",

                   header.block_size, DEFAULT_CLUSTER_SIZE);

        ret = -ENOTSUP;

        goto fail;