[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 1/9] qemu-io: Improve alignment checks
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v11 1/9] qemu-io: Improve alignment checks |
Date: |
Sat, 29 Apr 2017 14:14:11 -0500 |
Several copy-and-pasted alignment checks exist in qemu-io, which
could use some minor improvements:
- Manual comparison against 0x1ff is not as clean as using our
alignment macros (QEMU_IS_ALIGNED) from osdep.h.
- The error messages aren't quite grammatically correct.
Suggested-by: Philippe Mathieu-Daudé <address@hidden>
Suggested-by: Max Reitz <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
v11: retitle [was "qemu-io: Don't open-code QEMU_IS_ALIGNED"], improve
error messages
v10: new patch
---
qemu-io-cmds.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 21af9e6..6a0024b 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -740,13 +740,13 @@ static int read_f(BlockBackend *blk, int argc, char
**argv)
}
if (bflag) {
- if (offset & 0x1ff) {
- printf("offset %" PRId64 " is not sector aligned\n",
+ if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {
+ printf("%" PRId64 " is not a sector-aligned value for 'offset'\n",
offset);
return 0;
}
- if (count & 0x1ff) {
- printf("count %"PRId64" is not sector aligned\n",
+ if (!QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)) {
+ printf("%"PRId64" is not a sector-aligned value for 'count'\n",
count);
return 0;
}
@@ -1050,14 +1050,14 @@ static int write_f(BlockBackend *blk, int argc, char
**argv)
}
if (bflag || cflag) {
- if (offset & 0x1ff) {
- printf("offset %" PRId64 " is not sector aligned\n",
+ if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {
+ printf("%" PRId64 " is not a sector-aligned value for 'offset'\n",
offset);
return 0;
}
- if (count & 0x1ff) {
- printf("count %"PRId64" is not sector aligned\n",
+ if (!QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)) {
+ printf("%"PRId64" is not a sector-aligned value for 'count'\n",
count);
return 0;
}
@@ -1769,8 +1769,8 @@ static int alloc_f(BlockBackend *blk, int argc, char
**argv)
if (offset < 0) {
print_cvtnum_err(offset, argv[1]);
return 0;
- } else if (offset & 0x1ff) {
- printf("offset %" PRId64 " is not sector aligned\n",
+ } else if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {
+ printf("%" PRId64 " is not a sector-aligned value for 'offset'\n",
offset);
return 0;
}
--
2.9.3
- [Qemu-devel] [PATCH v11 0/9] add blkdebug tests, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 4/9] blkdebug: Sanity check block layer guarantees, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 5/9] blkdebug: Refactor error injection, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 7/9] blkdebug: Simplify override logic, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 1/9] qemu-io: Improve alignment checks,
Eric Blake <=
- [Qemu-devel] [PATCH v11 2/9] qemu-io: Switch 'alloc' command to byte-based length, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 3/9] qemu-io: Switch 'map' output to byte-based reporting, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 6/9] blkdebug: Add pass-through write_zero and discard support, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 8/9] blkdebug: Add ability to override unmap geometries, Eric Blake, 2017/04/29
- [Qemu-devel] [PATCH v11 9/9] tests: Add coverage for recent block geometry fixes, Eric Blake, 2017/04/29