[PATCH v2 3/3] Move TIME_* macros to util.h

[Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>]

These macros were being repeatedly used and so should share the same
definition.

Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
 src/common/util.h  |  5 +++++
 src/xenbus/cache.c |  5 -----
 src/xenbus/fdo.c   |  5 -----
 src/xenbus/store.c | 10 ----------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/common/util.h b/src/common/util.h
index dbf64fd..36f71f9 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -41,6 +41,11 @@
 #define        P2ROUNDUP(_t, _x, _a)   \
         (-(-((_t)(_x)) & -(((_t)(_a)))))
 
+#define TIME_US(_us)            ((_us) * 10ll)
+#define TIME_MS(_ms)            (TIME_US((_ms) * 1000ll))
+#define TIME_S(_s)              (TIME_MS((_s) * 1000ll))
+#define TIME_RELATIVE(_t)       (-(_t))
+
 static FORCEINLINE LONG
 __ffs(
     _In_ unsigned long long mask
diff --git a/src/xenbus/cache.c b/src/xenbus/cache.c
index ae72464..e513f77 100644
--- a/src/xenbus/cache.c
+++ b/src/xenbus/cache.c
@@ -1056,11 +1056,6 @@ CacheDebugCallback(
     }
 }
 
-#define TIME_US(_us)        ((_us) * 10)
-#define TIME_MS(_ms)        (TIME_US((_ms) * 1000))
-#define TIME_S(_s)          (TIME_MS((_s) * 1000))
-#define TIME_RELATIVE(_t)   (-(_t))
-
 #define XENBUS_CACHE_MONITOR_PERIOD 5
 
 static NTSTATUS
diff --git a/src/xenbus/fdo.c b/src/xenbus/fdo.c
index 50075f7..0537654 100644
--- a/src/xenbus/fdo.c
+++ b/src/xenbus/fdo.c
@@ -1642,11 +1642,6 @@ loop:
     return STATUS_SUCCESS;
 }
 
-#define TIME_US(_us)            ((_us) * 10ll)
-#define TIME_MS(_ms)            (TIME_US((_ms) * 1000ll))
-#define TIME_S(_s)              (TIME_MS((_s) * 1000ll))
-#define TIME_RELATIVE(_t)       (-(_t))
-
 static FORCEINLINE NTSTATUS
 __FdoBalloonSetActive(
     _In_ PXENBUS_FDO        Fdo
diff --git a/src/xenbus/store.c b/src/xenbus/store.c
index bd9067e..fe3efcc 100644
--- a/src/xenbus/store.c
+++ b/src/xenbus/store.c
@@ -909,11 +909,6 @@ StoreDpc(
     __StorePoll(Context);
 }
 
-#define TIME_US(_us)        ((_us) * 10)
-#define TIME_MS(_ms)        (TIME_US((_ms) * 1000))
-#define TIME_S(_s)          (TIME_MS((_s) * 1000))
-#define TIME_RELATIVE(_t)   (-(_t))
-
 #define XENBUS_STORE_POLL_PERIOD 5
 
 static PXENBUS_STORE_RESPONSE
@@ -1994,11 +1989,6 @@ StorePoll(
     __StorePoll(Interface->Context);
 }
 
-#define TIME_US(_us)        ((_us) * 10)
-#define TIME_MS(_ms)        (TIME_US((_ms) * 1000))
-#define TIME_S(_s)          (TIME_MS((_s) * 1000))
-#define TIME_RELATIVE(_t)   (-(_t))
-
 #define XENBUS_STORE_WATCHDOG_PERIOD 15
 
 static NTSTATUS
-- 
2.55.0.windows.3



--
Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech