[Spice-commits] server/reds.c server/utils.h

[GitLab Mirror]

 server/reds.c  |    2 +-
 server/utils.h |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit f84b26f801450cb8013c844cf73809afec034b02
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Oct 4 17:29:28 2018 +0200

    utils: Remove spice_get_monotonic_time_ms
    
    This is a thin wrapper over g_get_monotonic_time_ms, and is called only
    once, so we can call directly g_get_monotonic_time_ms instead.
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/reds.c b/server/reds.c
index 4f890348..4645f1c6 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3004,7 +3004,7 @@ static void migrate_timeout(void *opaque)
 
 uint32_t reds_get_mm_time(void)
 {
-    return spice_get_monotonic_time_ms();
+    return g_get_monotonic_time() / 1000;
 }
 
 void reds_enable_mm_time(RedsState *reds)
diff --git a/server/utils.h b/server/utils.h
index 58d43caf..07878539 100644
--- a/server/utils.h
+++ b/server/utils.h
@@ -66,11 +66,6 @@ static inline red_time_t spice_get_monotonic_time_ns(void)
 
 #define MSEC_PER_SEC 1000
 
-static inline red_time_t spice_get_monotonic_time_ms(void)
-{
-    return g_get_monotonic_time() / 1000;
-}
-
 int rgb32_data_has_alpha(int width, int height, size_t stride,
                          const uint8_t *data, int *all_set_out);