From: Leonid Bloch Date: Sun, 4 Nov 2018 18:09:28 +0000 (+0000) Subject: vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE X-Git-Tag: qemu-xen-4.13.0-rc1~578^2~1 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3dd5b8f4718c6ca1eadb16dd67a8cad76455ddb0;p=qemu-xen.git 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 Reviewed-by: Stefan Weil Signed-off-by: Kevin Wolf --- 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;