mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Use DIV_ROUND_UP

Browse Source 
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d).

This patch is the result of coccinelle script
scripts/coccinelle/round.cocci

CC: qemu-block@nongnu.org
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Laurent Vivier 2016-05-31 18:35:54 +02:00 committed by Michael Tokarev
parent c41a73ffaf
commit 13385ae168
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/vvfat.c
View File

@ -1960,8 +1960,7 @@ DLOG(fprintf(stderr, "check direntry %d:\n", i); print_direntry(direntries + i))
/* check file size with FAT */ /* check file size with FAT */
cluster_count = get_cluster_count_for_direntry(s, direntries + i, path2); cluster_count = get_cluster_count_for_direntry(s, direntries + i, path2);
if (cluster_count != if (cluster_count !=
(le32_to_cpu(direntries[i].size) + s->cluster_size DIV_ROUND_UP(le32_to_cpu(direntries[i].size), s->cluster_size)) {
- 1) / s->cluster_size) {
DLOG(fprintf(stderr, "Cluster count mismatch\n")); DLOG(fprintf(stderr, "Cluster count mismatch\n"));
goto fail; goto fail;
} }

2
hw/block/tc58128.c
View File

@ -45,7 +45,7 @@ static void init_dev(tc58128_dev * dev, const char *filename)
} }
} else { } else {
/* Build first block with number of blocks */ /* Build first block with number of blocks */
blocks = (ret + 528 * 32 - 1) / (528 * 32); blocks = DIV_ROUND_UP(ret, 528 * 32);
dev->flash_contents[0] = blocks & 0xff; dev->flash_contents[0] = blocks & 0xff;
dev->flash_contents[1] = (blocks >> 8) & 0xff; dev->flash_contents[1] = (blocks >> 8) & 0xff;
dev->flash_contents[2] = (blocks >> 16) & 0xff; dev->flash_contents[2] = (blocks >> 16) & 0xff;