Xen project Mailing List

Re: [Minios-devel] [UNIKRAFT PATCHv5 01/46] include: Reorganize base include folder to reflect CPU family schema

To: Wei Chen <wei.chen@xxxxxxx>, <minios-devel@xxxxxxxxxxxxxxxxxxxx>

From: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

Date: Thu, 6 Sep 2018 10:44:36 +0200

Delivery-date: Thu, 06 Sep 2018 08:44:53 +0000

List-id: Mini-os development list <minios-devel.lists.xenproject.org>

Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx> On 10.08.2018 09:07, Wei Chen wrote:

From: Wei Chen <Wei.Chen@xxxxxxx>

We modify the Unikraft's base include folder to reflect the CPU
family schema in this patch. Unikraft has the foresigh to wrap
different architectures' headers to arch/*.h. So, after folder
reorganization, we just update the include paths in arch/*.h is
enough.

Signed-off-by: Wei Chen <Wei.Chen@xxxxxxx>
---
  include/uk/arch/arm/{ => arm}/atomic.h      |  0
  include/uk/arch/arm/{ => arm}/intsizes.h    |  0
  include/uk/arch/arm/{ => arm}/lcpu.h        |  0
  include/uk/arch/arm/{ => arm}/limits.h      |  0
  include/uk/arch/arm/{ => arm}/types.h       |  0
  include/uk/arch/atomic.h                    |  8 ++++----
  include/uk/arch/lcpu.h                      |  8 ++++----
  include/uk/arch/limits.h                    | 16 ++++++++--------
  include/uk/arch/types.h                     | 16 ++++++++--------
  include/uk/arch/{ => x86}/x86_64/atomic.h   |  0
  include/uk/arch/{ => x86}/x86_64/intsizes.h |  0
  include/uk/arch/{ => x86}/x86_64/lcpu.h     |  0
  include/uk/arch/{ => x86}/x86_64/limits.h   |  0
  include/uk/arch/{ => x86}/x86_64/types.h    |  0
  14 files changed, 24 insertions(+), 24 deletions(-)
  rename include/uk/arch/arm/{ => arm}/atomic.h (100%)
  rename include/uk/arch/arm/{ => arm}/intsizes.h (100%)
  rename include/uk/arch/arm/{ => arm}/lcpu.h (100%)
  rename include/uk/arch/arm/{ => arm}/limits.h (100%)
  rename include/uk/arch/arm/{ => arm}/types.h (100%)
  rename include/uk/arch/{ => x86}/x86_64/atomic.h (100%)
  rename include/uk/arch/{ => x86}/x86_64/intsizes.h (100%)
  rename include/uk/arch/{ => x86}/x86_64/lcpu.h (100%)
  rename include/uk/arch/{ => x86}/x86_64/limits.h (100%)
  rename include/uk/arch/{ => x86}/x86_64/types.h (100%)

diff --git a/include/uk/arch/arm/atomic.h b/include/uk/arch/arm/arm/atomic.h
similarity index 100%
rename from include/uk/arch/arm/atomic.h
rename to include/uk/arch/arm/arm/atomic.h
diff --git a/include/uk/arch/arm/intsizes.h b/include/uk/arch/arm/arm/intsizes.h
similarity index 100%
rename from include/uk/arch/arm/intsizes.h
rename to include/uk/arch/arm/arm/intsizes.h
diff --git a/include/uk/arch/arm/lcpu.h b/include/uk/arch/arm/arm/lcpu.h
similarity index 100%
rename from include/uk/arch/arm/lcpu.h
rename to include/uk/arch/arm/arm/lcpu.h
diff --git a/include/uk/arch/arm/limits.h b/include/uk/arch/arm/arm/limits.h
similarity index 100%
rename from include/uk/arch/arm/limits.h
rename to include/uk/arch/arm/arm/limits.h
diff --git a/include/uk/arch/arm/types.h b/include/uk/arch/arm/arm/types.h
similarity index 100%
rename from include/uk/arch/arm/types.h
rename to include/uk/arch/arm/arm/types.h
diff --git a/include/uk/arch/atomic.h b/include/uk/arch/atomic.h
index 558067d..d7fbb02 100644
--- a/include/uk/arch/atomic.h
+++ b/include/uk/arch/atomic.h
@@ -37,16 +37,16 @@ extern "C" {
  #endif

#ifdef __X86_32__

-#include <uk/arch/x86/atomic.h>
+#include <uk/arch/x86/x86/atomic.h>
  #endif
  #ifdef __X86_64__
-#include <uk/arch/x86_64/atomic.h>
+#include <uk/arch/x86/x86_64/atomic.h>
  #endif
  #ifdef __ARM_32__
-#include <uk/arch/arm/atomic.h>
+#include <uk/arch/arm/arm/atomic.h>
  #endif
  #ifdef __ARM_64__
-#include <uk/arch/arm64/atomic.h>
+#include <uk/arch/arm/arm64/atomic.h>
  #endif

/**

diff --git a/include/uk/arch/lcpu.h b/include/uk/arch/lcpu.h
index ea780f7..a9e10d2 100644
--- a/include/uk/arch/lcpu.h
+++ b/include/uk/arch/lcpu.h
@@ -43,16 +43,16 @@ extern "C" {
  #endif

#ifdef __X86_32__

-#include <uk/arch/x86/lcpu.h>
+#include <uk/arch/x86/x86/lcpu.h>
  #endif
  #ifdef __X86_64__
-#include <uk/arch/x86_64/lcpu.h>
+#include <uk/arch/x86/x86_64/lcpu.h>
  #endif
  #ifdef __ARM_32__
-#include <uk/arch/arm/lcpu.h>
+#include <uk/arch/arm/arm/lcpu.h>
  #endif
  #ifdef __ARM_64__
-#include <uk/arch/arm64/lcpu.h>
+#include <uk/arch/arm/arm64/lcpu.h>
  #endif

#ifndef likely

diff --git a/include/uk/arch/limits.h b/include/uk/arch/limits.h
index 81694d9..a0683ad 100644
--- a/include/uk/arch/limits.h
+++ b/include/uk/arch/limits.h
@@ -37,31 +37,31 @@
  #define __UKARCH_LIMITS_H__

#ifdef __X86_32__

-#include <uk/arch/x86/limits.h>
+#include <uk/arch/x86/x86/limits.h>
  #endif
  #ifdef __X86_64__
-#include <uk/arch/x86_64/limits.h>
+#include <uk/arch/x86/x86_64/limits.h>
  #endif
  #ifdef __ARM_32__
-#include <uk/arch/arm/limits.h>
+#include <uk/arch/arm/arm/limits.h>
  #endif
  #ifdef __ARM_64__
-#include <uk/arch/arm64/limits.h>
+#include <uk/arch/arm/arm64/limits.h>
  #endif

#ifndef __ASSEMBLY__#ifdef __X86_32__

-#include <uk/arch/x86/intsizes.h>
+#include <uk/arch/x86/x86/intsizes.h>
  #endif
  #ifdef __X86_64__
-#include <uk/arch/x86_64/intsizes.h>
+#include <uk/arch/x86/x86_64/intsizes.h>
  #endif
  #ifdef __ARM_32__
-#include <uk/arch/arm/intsizes.h>
+#include <uk/arch/arm/arm/intsizes.h>
  #endif
  #ifdef __ARM_64__
-#include <uk/arch/arm64/intsizes.h>
+#include <uk/arch/arm/arm64/intsizes.h>
  #endif

#if (defined __C_IS_8)

diff --git a/include/uk/arch/types.h b/include/uk/arch/types.h
index a69dc49..7731e26 100644
--- a/include/uk/arch/types.h
+++ b/include/uk/arch/types.h
@@ -41,20 +41,20 @@ extern "C" {
  #endif

#ifdef __X86_32__

-#include <uk/arch/x86/intsizes.h>
-#include <uk/arch/x86/types.h>
+#include <uk/arch/x86/x86/intsizes.h>
+#include <uk/arch/x86/x86/types.h>
  #endif
  #ifdef __X86_64__
-#include <uk/arch/x86_64/intsizes.h>
-#include <uk/arch/x86_64/types.h>
+#include <uk/arch/x86/x86_64/intsizes.h>
+#include <uk/arch/x86/x86_64/types.h>
  #endif
  #ifdef __ARM_32__
-#include <uk/arch/arm/intsizes.h>
-#include <uk/arch/arm/types.h>
+#include <uk/arch/arm/arm/intsizes.h>
+#include <uk/arch/arm/arm/types.h>
  #endif
  #ifdef __ARM_64__
-#include <uk/arch/arm64/intsizes.h>
-#include <uk/arch/arm64/types.h>
+#include <uk/arch/arm/arm64/intsizes.h>
+#include <uk/arch/arm/arm64/types.h>
  #endif

#ifndef __ASSEMBLY__

diff --git a/include/uk/arch/x86_64/atomic.h 
b/include/uk/arch/x86/x86_64/atomic.h
similarity index 100%
rename from include/uk/arch/x86_64/atomic.h
rename to include/uk/arch/x86/x86_64/atomic.h
diff --git a/include/uk/arch/x86_64/intsizes.h 
b/include/uk/arch/x86/x86_64/intsizes.h
similarity index 100%
rename from include/uk/arch/x86_64/intsizes.h
rename to include/uk/arch/x86/x86_64/intsizes.h
diff --git a/include/uk/arch/x86_64/lcpu.h b/include/uk/arch/x86/x86_64/lcpu.h
similarity index 100%
rename from include/uk/arch/x86_64/lcpu.h
rename to include/uk/arch/x86/x86_64/lcpu.h
diff --git a/include/uk/arch/x86_64/limits.h 
b/include/uk/arch/x86/x86_64/limits.h
similarity index 100%
rename from include/uk/arch/x86_64/limits.h
rename to include/uk/arch/x86/x86_64/limits.h
diff --git a/include/uk/arch/x86_64/types.h b/include/uk/arch/x86/x86_64/types.h
similarity index 100%
rename from include/uk/arch/x86_64/types.h
rename to include/uk/arch/x86/x86_64/types.h

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

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.