[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Minios-devel] [UNIKRAFT PATCH] lib/nolibc: don't include uk/plat/time.h from time.h



Hi Dafna,

good catch, thanks.

On 09/23/2018 04:38 PM, Dafna Hirschfeld wrote:
Including uk/plat/time.h in time.h of nolibc expose
platform's symbols such as ukplat_monotonic_clock
which are not part of libc.
Instead, uk/plat/time.h should be included directly
from time.c in nolibc

Signed-off-by: Dafna Hirschfeld <dafna3@xxxxxxxxx>
Reviewed-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>

---
  lib/nolibc/include/sys/time.h | 1 -
  lib/nolibc/time.c             | 2 +-
  2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/nolibc/include/sys/time.h b/lib/nolibc/include/sys/time.h
index 11f89bb..e08fa85 100644
--- a/lib/nolibc/include/sys/time.h
+++ b/lib/nolibc/include/sys/time.h
@@ -36,7 +36,6 @@
  #ifndef __SYS_TIME_H__
  #define __SYS_TIME_H__
-#include <uk/plat/time.h>
  #include <sys/select.h>
#ifdef __cplusplus
diff --git a/lib/nolibc/time.c b/lib/nolibc/time.c
index 0467033..78b1b4b 100644
--- a/lib/nolibc/time.c
+++ b/lib/nolibc/time.c
@@ -36,13 +36,13 @@
   */
#include <time.h>
+#include <uk/plat/time.h>
  #include <errno.h>
  #include <uk/config.h>
  #if CONFIG_HAVE_SCHED
  #include <uk/sched.h>
  #else
  #include <uk/plat/lcpu.h>
-#include <uk/plat/time.h>
  #endif
#ifndef CONFIG_HAVE_SCHED


--
Dr. Florian Schmidt
フローリアン・シュミット
Research Scientist,
Systems and Machine Learning Group
NEC Laboratories Europe
Kurfürsten-Anlage 36, D-69115 Heidelberg
Tel.     +49 (0)6221 4342-265
Fax:     +49 (0)6221 4342-155
e-mail:  florian.schmidt@xxxxxxxxx
============================================================
Registered at Amtsgericht Mannheim, Germany, HRB728558

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.