[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 39/52] qcow/qcow2: Use DIV_ROUND_UP
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 39/52] qcow/qcow2: Use DIV_ROUND_UP |
Date: |
Sun, 5 Jun 2016 10:43:16 +0300 |
From: Laurent Vivier <address@hidden>
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>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <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.1.4
- [Qemu-trivial] [PULL 04/52] qga: spelling fix, (continued)
- [Qemu-trivial] [PULL 04/52] qga: spelling fix, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 35/52] thunk: Drop unused NO_THUNK_TYPE_SIZE guards, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 51/52] qemu-timer: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 12/52] replace muldiv64(a, b, c) by (uint64_t)a * b / c, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 21/52] fw_cfg: follow CODING_STYLE, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 02/52] hw/ipmi: fix spelling, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 16/52] configure: Use $(..) instead of deprecated `..`, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 41/52] block: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 22/52] replay: Clean up includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 45/52] SPICE: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 39/52] qcow/qcow2: Use DIV_ROUND_UP,
Michael Tokarev <=
- [Qemu-trivial] [PULL 03/52] docs: "specify" spell fix, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 33/52] host-utils: Prefer 'false' for bool type, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 49/52] linux-user: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 28/52] clean-includes: Add glib.h to list of unneeded includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 40/52] qed: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 48/52] slirp: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 47/52] usb: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 37/52] coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 44/52] audio: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 46/52] rocker: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05