[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/32] block/vdi: Use {DIV_,}ROUND_UP
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 04/32] block/vdi: Use {DIV_,}ROUND_UP |
Date: |
Thu, 23 Oct 2014 22:42:11 +0200 |
From: Max Reitz <address@hidden>
There are macros for these operations, so make use of them.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vdi.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 9604721..19701ee 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -407,8 +407,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options,
int flags,
We accept them but round the disk size to the next multiple of
SECTOR_SIZE. */
logout("odd disk size %" PRIu64 " B, round up\n", header.disk_size);
- header.disk_size += SECTOR_SIZE - 1;
- header.disk_size &= ~(SECTOR_SIZE - 1);
+ header.disk_size = ROUND_UP(header.disk_size, SECTOR_SIZE);
}
if (header.signature != VDI_SIGNATURE) {
@@ -475,7 +474,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options,
int flags,
s->header = header;
bmap_size = header.blocks_in_image * sizeof(uint32_t);
- bmap_size = (bmap_size + SECTOR_SIZE - 1) / SECTOR_SIZE;
+ bmap_size = DIV_ROUND_UP(bmap_size, SECTOR_SIZE);
s->bmap = qemu_try_blockalign(bs->file, bmap_size * SECTOR_SIZE);
if (s->bmap == NULL) {
ret = -ENOMEM;
@@ -736,10 +735,10 @@ static int vdi_create(const char *filename, QemuOpts
*opts, Error **errp)
/* We need enough blocks to store the given disk size,
so always round up. */
- blocks = (bytes + block_size - 1) / block_size;
+ blocks = DIV_ROUND_UP(bytes, block_size);
bmap_size = blocks * sizeof(uint32_t);
- bmap_size = ((bmap_size + SECTOR_SIZE - 1) & ~(SECTOR_SIZE -1));
+ bmap_size = ROUND_UP(bmap_size, SECTOR_SIZE);
memset(&header, 0, sizeof(header));
pstrcpy(header.text, sizeof(header.text), VDI_TEXT);
--
1.8.3.1
- [Qemu-devel] [PULL 00/32] Block patches, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 03/32] MAINTAINERS: add the image fuzzer to the block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 01/32] MAINTAINERS: add aio to block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 05/32] block: qemu-iotests change _supported_proto to file once more., Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 02/32] MAINTAINERS: qemu-iotests belongs to the block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 06/32] block: Add qemu_{,try_}blockalign0(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 04/32] block/vdi: Use {DIV_,}ROUND_UP,
Kevin Wolf <=
- [Qemu-devel] [PULL 08/32] qcow2: Fix leaks in dirty images, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 07/32] qcow2: Calculate refcount block entry count, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 09/32] qcow2: Split qcow2_check_refcounts(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 10/32] qcow2: Use sizeof(**refcount_table), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 11/32] qcow2: Pull check_refblocks() up, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 13/32] qcow2: Split fail code in L1 and L2 checks, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 12/32] qcow2: Use int64_t for in-memory reftable size, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 14/32] qcow2: Let inc_refcounts() return -errno, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 16/32] qcow2: Reuse refcount table in calculate_refcounts(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 15/32] qcow2: Let inc_refcounts() resize the reftable, Kevin Wolf, 2014/10/23