[Qemu-devel] [PATCH v10 06/17] qemu-io: Don't open-code QEMU_IS_ALIGNED

[Eric Blake]

Manual comparison against 0x1ff is not as clean as using our
alignment macros from osdep.h.

Suggested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Eric Blake <address@hidden>

---
v10: new patch
---
 qemu-io-cmds.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 21af9e6..fabc394 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -740,12 +740,12 @@ static int read_f(BlockBackend *blk, int argc, char 
**argv)
     }

     if (bflag) {
-        if (offset & 0x1ff) {
+        if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {
             printf("offset %" PRId64 " is not sector aligned\n",
                    offset);
             return 0;
         }
-        if (count & 0x1ff) {
+        if (!QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)) {
             printf("count %"PRId64" is not sector aligned\n",
                    count);
             return 0;
@@ -1050,13 +1050,13 @@ static int write_f(BlockBackend *blk, int argc, char 
**argv)
     }

     if (bflag || cflag) {
-        if (offset & 0x1ff) {
+        if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {
             printf("offset %" PRId64 " is not sector aligned\n",
                    offset);
             return 0;
         }

-        if (count & 0x1ff) {
+        if (!QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)) {
             printf("count %"PRId64" is not sector aligned\n",
                    count);
             return 0;
@@ -1769,7 +1769,7 @@ 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) {
+    } else if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {
         printf("offset %" PRId64 " is not sector aligned\n",
                offset);
         return 0;
-- 
2.9.3