aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorFrediano Ziglio <fziglio@redhat.com>2019-10-23 13:26:52 +0100
committerLaurent Vivier <laurent@vivier.eu>2019-10-24 20:10:18 +0200
commit5bd3435442104a73caba0167e57911e72b791500 (patch)
tree3cd5958fb67756ded7ea49c18b4fea59ae35af43 /util
parent105e1023a855dd13fc15a8253fe6476f443e48aa (diff)
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>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-timer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index d428fec567..ef52d28d37 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);
}