diff options
| author | Alberto Garcia <berto@igalia.com> | 2020-01-18 20:09:30 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2020-02-06 13:47:45 +0100 |
| commit | 3afea40243d7ccba7b569daa4dc7b174e594f792 (patch) | |
| tree | 906bd4497b8a62d335d9bc0bebce26da8ef17419 | |
| parent | 25ae71db55ebb06bfa501f17dabb96ff3b34921b (diff) | |
| download | focaccia-qemu-3afea40243d7ccba7b569daa4dc7b174e594f792.tar.gz focaccia-qemu-3afea40243d7ccba7b569daa4dc7b174e594f792.zip | |
qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value
This replaces all remaining instances in the qcow2 code. Signed-off-by: Alberto Garcia <berto@igalia.com> Message-id: b5f74b606c2d9873b12d29acdb7fd498029c4025.1579374329.git.berto@igalia.com Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | block/qcow2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index ff257d1a6c..ef96606f8d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3272,7 +3272,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) /* Validate options and set default values */ if (!QEMU_IS_ALIGNED(qcow2_opts->size, BDRV_SECTOR_SIZE)) { - error_setg(errp, "Image size must be a multiple of 512 bytes"); + error_setg(errp, "Image size must be a multiple of %u bytes", + (unsigned) BDRV_SECTOR_SIZE); ret = -EINVAL; goto out; } @@ -3946,8 +3947,9 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, return -ENOTSUP; } - if (offset & 511) { - error_setg(errp, "The new size must be a multiple of 512"); + if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) { + error_setg(errp, "The new size must be a multiple of %u", + (unsigned) BDRV_SECTOR_SIZE); return -EINVAL; } |