diff options
| author | Leonid Bloch <lbloch@janustech.com> | 2018-11-04 18:09:28 +0000 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-11-05 15:28:48 +0100 |
| commit | 3dd5b8f4718c6ca1eadb16dd67a8cad76455ddb0 (patch) | |
| tree | ac8ba5e3673aacb5286ebd8b3708814f6a418b3c /block | |
| parent | 679be303f7b40accfd8040c059680f253fc3c3b5 (diff) | |
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: Leonid Bloch <lbloch@janustech.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/vdi.c b/block/vdi.c index 0ff1ead736..2380daa583 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -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; |