From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 22 Jun 2017 11:04:16 +0000 (+0200)
Subject: vvfat: use DIV_ROUND_UP
X-Git-Tag: v2.11.0-rc0~141^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78ee96de6486ab9ff5c38145b55d5fc7de43dd77;p=thirdparty%2Fqemu.git

vvfat: use DIV_ROUND_UP

I used the clang-tidy qemu-round check to generate the fix:
https://github.com/elmarco/clang-tools-extra

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/block/vvfat.c b/block/vvfat.c
index a9e207f7f0a..c54fa94651c 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -449,7 +449,7 @@ static direntry_t *create_long_filename(BDRVVVFATState *s, const char *filename)
         return NULL;
     }
 
-    number_of_entries = (length * 2 + 25) / 26;
+    number_of_entries = DIV_ROUND_UP(length * 2, 26);
 
     for(i=0;i<number_of_entries;i++) {
         entry=array_get_next(&(s->directory));
@@ -2554,7 +2554,7 @@ static int commit_one_file(BDRVVVFATState* s,
                 (size > offset && c >=2 && !fat_eof(s, c)));
 
         ret = vvfat_read(s->bs, cluster2sector(s, c),
-            (uint8_t*)cluster, (rest_size + 0x1ff) / 0x200);
+            (uint8_t*)cluster, DIV_ROUND_UP(rest_size, 0x200));
 
         if (ret < 0) {
             qemu_close(fd);