commit 5bd3435442104a73caba0167e57911e72b791500
author Frediano Ziglio <fziglio@redhat.com> Wed Oct 23 13:26:52 2019 +0100
committer Laurent Vivier <laurent@vivier.eu> Thu Oct 24 20:10:18 2019 +0200
tree 3cd5958fb67756ded7ea49c18b4fea59ae35af43
parent 105e1023a855dd13fc15a8253fe6476f443e48aa

qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191023122652.2999-3-fziglio@redhat.com>
[lv: removed the two useless casts]
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>

util/qemu-timer.c

diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index d428fec..ef52d28 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -322,11 +322,7 @@
     ms = DIV_ROUND_UP(ns, SCALE_MS);
 
     /* To avoid overflow problems, limit this to 2^31, i.e. approx 25 days */
-    if (ms > (int64_t) INT32_MAX) {
-        ms = INT32_MAX;
-    }
-
-    return (int) ms;
+    return MIN(ms, INT32_MAX);
 }