From: Frediano Ziglio <fzig...@redhat.com>
Signed-off-by: Frediano Ziglio <fzig...@redhat.com>
Reviewed-by: Laurent Vivier <laur...@vivier.eu>
Message-Id: <20191023122652.2999-3-fzig...@redhat.com>
[lv: removed the two useless casts]
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Laurent Vivier <laur...@vivier.eu>
---
util/qemu-timer.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index d428fec56772..ef52d28d3753 100644
--- 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);
}
--
2.21.0
