qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms

Signed-off-by: Frediano Ziglio <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]>
Message-Id: <20191023122652[email protected]>
[lv: removed the two useless casts]
Reviewed-by: Eric Blake <[email protected]>
Signed-off-by: Laurent Vivier <[email protected]>

diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index d428fec5677258b18f0d2d4bb1923a80fac69d94..ef52d28d3753302bd371eb8965aed8aa9462ae95 100644 (file)
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -322,11 +322,7 @@ int qemu_timeout_ns_to_ms(int64_t ns)
     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);
 }