aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorStefano Garzarella <sgarzare@redhat.com>2019-03-27 10:56:33 +0100
committerKevin Wolf <kwolf@redhat.com>2019-04-30 15:29:00 +0200
commite9991e29ea5efb91324a1b1e10fbf553867964df (patch)
tree7525a6a79e9f1df92fe2a0bb49fca4aa8a1974a9 /block
parent7502be838e2fb62cc00f9e55f632e0b88ead5e6e (diff)
downloadqemu-e9991e29ea5efb91324a1b1e10fbf553867964df.zip
qemu-e9991e29ea5efb91324a1b1e10fbf553867964df.tar.gz
qemu-e9991e29ea5efb91324a1b1e10fbf553867964df.tar.bz2
block/vhdx: Remove redundant IEC binary prefixes definition
IEC binary prefixes are already defined in "qemu/units.h", so we can remove redundant definitions in "block/vhdx.h". Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/vhdx.c3
-rw-r--r--block/vhdx.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/block/vhdx.c b/block/vhdx.c
index b785aef..7cd1fc3 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -1889,7 +1889,8 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
return -EINVAL;
}
if (block_size > VHDX_BLOCK_SIZE_MAX) {
- error_setg(errp, "Block size must not exceed %d", VHDX_BLOCK_SIZE_MAX);
+ error_setg(errp, "Block size must not exceed %" PRId64,
+ VHDX_BLOCK_SIZE_MAX);
return -EINVAL;
}
diff --git a/block/vhdx.h b/block/vhdx.h
index 1bfb4e4..bf72090 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -17,11 +17,7 @@
#ifndef BLOCK_VHDX_H
#define BLOCK_VHDX_H
-
-#define KiB (1 * 1024)
-#define MiB (KiB * 1024)
-#define GiB (MiB * 1024)
-#define TiB ((uint64_t) GiB * 1024)
+#include "qemu/units.h"
#define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
/* Structures and fields present in the VHDX file */