[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 03/16] qcow/qcow2: Use DIV_ROUND_UP
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PATCH 03/16] qcow/qcow2: Use DIV_ROUND_UP |
Date: |
Tue, 31 May 2016 18:35:52 +0200 |
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d).
This patch is the result of coccinelle script
scripts/coccinelle/round.cocci
CC: address@hidden
Signed-off-by: Laurent Vivier <address@hidden>
---
block/qcow.c | 4 ++--
block/qcow2-cluster.c | 4 ++--
block/qcow2-refcount.c | 6 ++----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/block/qcow.c b/block/qcow.c
index cb4bf02..c5cf813 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -868,8 +868,8 @@ static int qcow_create(const char *filename, QemuOpts
*opts, Error **errp)
}
tmp = g_malloc0(BDRV_SECTOR_SIZE);
- for (i = 0; i < ((sizeof(uint64_t)*l1_size + BDRV_SECTOR_SIZE - 1)/
- BDRV_SECTOR_SIZE); i++) {
+ for (i = 0; i < DIV_ROUND_UP(sizeof(uint64_t) * l1_size, BDRV_SECTOR_SIZE);
+ i++) {
ret = blk_pwrite(qcow_blk, header_size + BDRV_SECTOR_SIZE * i,
tmp, BDRV_SECTOR_SIZE, 0);
if (ret != BDRV_SECTOR_SIZE) {
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 892e0fb..c737973 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1868,8 +1868,8 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs,
}
for (i = 0; i < s->nb_snapshots; i++) {
- int l1_sectors = (s->snapshots[i].l1_size * sizeof(uint64_t) +
- BDRV_SECTOR_SIZE - 1) / BDRV_SECTOR_SIZE;
+ int l1_sectors = DIV_ROUND_UP(s->snapshots[i].l1_size *
+ sizeof(uint64_t), BDRV_SECTOR_SIZE);
l1_table = g_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE);
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 7fa972a..66f187a 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -490,14 +490,12 @@ static int alloc_refcount_block(BlockDriverState *bs,
uint64_t table_clusters =
size_to_clusters(s, table_size * sizeof(uint64_t));
blocks_clusters = 1 +
- ((table_clusters + s->refcount_block_size - 1)
- / s->refcount_block_size);
+ DIV_ROUND_UP(table_clusters, s->refcount_block_size);
uint64_t meta_clusters = table_clusters + blocks_clusters;
last_table_size = table_size;
table_size = next_refcount_table_size(s, blocks_used +
- ((meta_clusters + s->refcount_block_size - 1)
- / s->refcount_block_size));
+ DIV_ROUND_UP(meta_clusters, s->refcount_block_size));
} while (last_table_size != table_size);
--
2.5.5
- [Qemu-trivial] [PATCH 00/16] use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 01/16] coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 02/16] parallels: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 03/16] qcow/qcow2: Use DIV_ROUND_UP,
Laurent Vivier <=
- [Qemu-trivial] [PATCH 07/16] xen: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 06/16] crypto: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 05/16] block: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 04/16] qed: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 08/16] audio: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 09/16] SPICE: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31