[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/5] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded valu
From: |
Alberto Garcia |
Subject: |
[PATCH v3 5/5] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value |
Date: |
Sat, 18 Jan 2020 20:09:30 +0100 |
This replaces all remaining instances in the qcow2 code.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index a6b0d4ee1d..6cc13e388c 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3273,7 +3273,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;
}
@@ -3947,8 +3948,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;
}
--
2.20.1
- [PATCH v3 0/5] Misc BDRV_SECTOR_SIZE updates, Alberto Garcia, 2020/01/18
- [PATCH v3 5/5] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value,
Alberto Garcia <=
- [PATCH v3 4/5] qcow2: Don't require aligned offsets in qcow2_co_copy_range_from(), Alberto Garcia, 2020/01/18
- [PATCH v3 2/5] qcow2: Tighten cluster_offset alignment assertions, Alberto Garcia, 2020/01/18
- [PATCH v3 1/5] qcow2: Don't round the L1 table allocation up to the sector size, Alberto Garcia, 2020/01/18
- [PATCH v3 3/5] qcow2: Use bs->bl.request_alignment when updating an L1 entry, Alberto Garcia, 2020/01/18
- Re: [PATCH v3 0/5] Misc BDRV_SECTOR_SIZE updates, Max Reitz, 2020/01/21