[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Minios-devel] [UNIKRAFT PATCH 1/1] Move plat/common/include headers to plat/common/include/uk/plat/common

With this patch we attempt to namespace the plat/common headers
to avoid problems with libraries that have files with the same
names

Signed-off-by: Santiago Pagani <santiago.pagani@xxxxxxxxx>
---
 plat/common/arm/cpu_native.c                          | 4 ++--
 plat/common/arm/generic_timer.c                       | 4 ++--
 plat/common/arm/thread_start64.S                      | 2 +-
 plat/common/arm/time.c                                | 4 ++--
 plat/common/include/arm/arm64/cpu.h                   | 2 +-
 plat/common/include/arm/arm64/time.h                  | 2 +-
 plat/common/include/{ => uk/plat/common}/_time.h      | 0
 plat/common/include/{ => uk/plat/common}/common.lds.h | 0
 plat/common/include/{ => uk/plat/common}/cpu.h        | 0
 plat/common/include/{ => uk/plat/common}/irq.h        | 0
 plat/common/include/{ => uk/plat/common}/memory.h     | 0
 plat/common/include/{ => uk/plat/common}/sections.h   | 0
 plat/common/include/{ => uk/plat/common}/sw_ctx.h     | 0
 plat/common/include/{ => uk/plat/common}/tls.h        | 0
 plat/common/include/{ => uk/plat/common}/trace.h      | 0
 plat/common/include/x86/cpu.h                         | 2 +-
 plat/common/lcpu.c                                    | 4 ++--
 plat/common/memory.c                                  | 2 +-
 plat/common/pci_bus.c                                 | 2 +-
 plat/common/sw_ctx.c                                  | 6 +++---
 plat/common/thread.c                                  | 2 +-
 plat/common/x86/thread_start.S                        | 2 +-
 plat/common/x86/trace.c                               | 2 +-
 plat/common/x86/traps.c                               | 2 +-
 plat/drivers/gic/gic-v2.c                             | 2 +-
 plat/drivers/include/virtio/virtio_config.h           | 2 +-
 plat/drivers/virtio/virtio_ring.c                     | 2 +-
 plat/kvm/arm/entry64.S                                | 2 +-
 plat/kvm/arm/link64.lds.S                             | 2 +-
 plat/kvm/arm/setup.c                                  | 2 +-
 plat/kvm/irq.c                                        | 4 ++--
 plat/kvm/memory.c                                     | 2 +-
 plat/kvm/shutdown.c                                   | 4 ++--
 plat/kvm/x86/link64.lds.S                             | 2 +-
 plat/kvm/x86/setup.c                                  | 2 +-
 plat/linuxu/arm/link.lds.S                            | 2 +-
 plat/linuxu/lcpu.c                                    | 2 +-
 plat/linuxu/setup.c                                   | 2 +-
 plat/linuxu/x86/link64.lds.S                          | 2 +-
 plat/xen/arm/link32.lds.S                             | 2 +-
 plat/xen/arm/setup.c                                  | 2 +-
 plat/xen/include/xen-arm/mm.h                         | 2 +-
 plat/xen/include/xen-x86/mm.h                         | 2 +-
 plat/xen/memory.c                                     | 2 +-
 plat/xen/x86/arch_time.c                              | 2 +-
 plat/xen/x86/link64.lds.S                             | 2 +-
 plat/xen/x86/mm.c                                     | 2 +-
 47 files changed, 46 insertions(+), 46 deletions(-)
 rename plat/common/include/{ => uk/plat/common}/_time.h (100%)
 rename plat/common/include/{ => uk/plat/common}/common.lds.h (100%)
 rename plat/common/include/{ => uk/plat/common}/cpu.h (100%)
 rename plat/common/include/{ => uk/plat/common}/irq.h (100%)
 rename plat/common/include/{ => uk/plat/common}/memory.h (100%)
 rename plat/common/include/{ => uk/plat/common}/sections.h (100%)
 rename plat/common/include/{ => uk/plat/common}/sw_ctx.h (100%)
 rename plat/common/include/{ => uk/plat/common}/tls.h (100%)
 rename plat/common/include/{ => uk/plat/common}/trace.h (100%)

diff --git a/plat/common/arm/cpu_native.c b/plat/common/arm/cpu_native.c
index d9364835..4f27bd28 100644
--- a/plat/common/arm/cpu_native.c
+++ b/plat/common/arm/cpu_native.c
@@ -32,10 +32,10 @@
  * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #include <uk/config.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 #if !CONFIG_ARCH_ARM_32
 /* TODO: Not yet supported for Arm32 */
-#include <irq.h>
+#include <uk/plat/common/irq.h>
 #include <arm/cpu_defs.h>
 #endif
 #include <uk/assert.h>
diff --git a/plat/common/arm/generic_timer.c b/plat/common/arm/generic_timer.c
index 59e53f15..58a9f403 100644
--- a/plat/common/arm/generic_timer.c
+++ b/plat/common/arm/generic_timer.c
@@ -37,9 +37,9 @@
 #include <uk/plat/lcpu.h>
 #include <uk/plat/irq.h>
 #include <uk/bitops.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 #include <ofw/gic_fdt.h>
-#include <irq.h>
+#include <uk/plat/common/irq.h>
 #include <gic/gic-v2.h>
 #include <arm/time.h>
 
diff --git a/plat/common/arm/thread_start64.S b/plat/common/arm/thread_start64.S
index b77463ab..9a80f62a 100644
--- a/plat/common/arm/thread_start64.S
+++ b/plat/common/arm/thread_start64.S
@@ -31,7 +31,7 @@
  *
  * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
-#include <sw_ctx.h>
+#include <uk/plat/common/sw_ctx.h>
 #include <uk/arch/lcpu.h>
 #include <uk/asm.h>
 
diff --git a/plat/common/arm/time.c b/plat/common/arm/time.c
index 46407aff..bbb3c72f 100644
--- a/plat/common/arm/time.c
+++ b/plat/common/arm/time.c
@@ -39,9 +39,9 @@
 #include <uk/plat/lcpu.h>
 #include <uk/plat/irq.h>
 #include <uk/bitops.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 #include <ofw/gic_fdt.h>
-#include <irq.h>
+#include <uk/plat/common/irq.h>
 #include <gic/gic-v2.h>
 #include <arm/time.h>
 
diff --git a/plat/common/include/arm/arm64/cpu.h 
b/plat/common/include/arm/arm64/cpu.h
index ff33f7cf..122727ad 100644
--- a/plat/common/include/arm/arm64/cpu.h
+++ b/plat/common/include/arm/arm64/cpu.h
@@ -37,7 +37,7 @@
 
 #include <inttypes.h>
 #include <uk/essentials.h>
-#include <sw_ctx.h>
+#include <uk/plat/common/sw_ctx.h>
 #include <uk/alloc.h>
 #include <uk/assert.h>
 
diff --git a/plat/common/include/arm/arm64/time.h 
b/plat/common/include/arm/arm64/time.h
index 95c7e7ab..bc9d7fb2 100644
--- a/plat/common/include/arm/arm64/time.h
+++ b/plat/common/include/arm/arm64/time.h
@@ -35,7 +35,7 @@
 #define UK_PLAT_COMMON_ARM64_TIME_H
 
 #include <uk/plat/lcpu.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 
 #define        get_el0(x)      SYSREG_READ64(x ##_el0)
 #define        get_el1(x)      SYSREG_READ64(x ##_el1)
diff --git a/plat/common/include/_time.h 
b/plat/common/include/uk/plat/common/_time.h
similarity index 100%
rename from plat/common/include/_time.h
rename to plat/common/include/uk/plat/common/_time.h
diff --git a/plat/common/include/common.lds.h 
b/plat/common/include/uk/plat/common/common.lds.h
similarity index 100%
rename from plat/common/include/common.lds.h
rename to plat/common/include/uk/plat/common/common.lds.h
diff --git a/plat/common/include/cpu.h 
b/plat/common/include/uk/plat/common/cpu.h
similarity index 100%
rename from plat/common/include/cpu.h
rename to plat/common/include/uk/plat/common/cpu.h
diff --git a/plat/common/include/irq.h 
b/plat/common/include/uk/plat/common/irq.h
similarity index 100%
rename from plat/common/include/irq.h
rename to plat/common/include/uk/plat/common/irq.h
diff --git a/plat/common/include/memory.h 
b/plat/common/include/uk/plat/common/memory.h
similarity index 100%
rename from plat/common/include/memory.h
rename to plat/common/include/uk/plat/common/memory.h
diff --git a/plat/common/include/sections.h 
b/plat/common/include/uk/plat/common/sections.h
similarity index 100%
rename from plat/common/include/sections.h
rename to plat/common/include/uk/plat/common/sections.h
diff --git a/plat/common/include/sw_ctx.h 
b/plat/common/include/uk/plat/common/sw_ctx.h
similarity index 100%
rename from plat/common/include/sw_ctx.h
rename to plat/common/include/uk/plat/common/sw_ctx.h
diff --git a/plat/common/include/tls.h 
b/plat/common/include/uk/plat/common/tls.h
similarity index 100%
rename from plat/common/include/tls.h
rename to plat/common/include/uk/plat/common/tls.h
diff --git a/plat/common/include/trace.h 
b/plat/common/include/uk/plat/common/trace.h
similarity index 100%
rename from plat/common/include/trace.h
rename to plat/common/include/uk/plat/common/trace.h
diff --git a/plat/common/include/x86/cpu.h b/plat/common/include/x86/cpu.h
index d2cf53af..4a3f65d4 100644
--- a/plat/common/include/x86/cpu.h
+++ b/plat/common/include/x86/cpu.h
@@ -32,7 +32,7 @@
 
 #include <uk/arch/types.h>
 #include <x86/cpu_defs.h>
-#include <sw_ctx.h>
+#include <uk/plat/common/sw_ctx.h>
 #include <stdint.h>
 #include <uk/assert.h>
 #include <uk/alloc.h>
diff --git a/plat/common/lcpu.c b/plat/common/lcpu.c
index 517a3df6..fe08a393 100644
--- a/plat/common/lcpu.c
+++ b/plat/common/lcpu.c
@@ -33,8 +33,8 @@
  */
 
 #include <uk/plat/lcpu.h>
-#include <cpu.h>
-#include <_time.h>
+#include <uk/plat/common/cpu.h>
+#include <uk/plat/common/_time.h>
 
 
 void ukplat_lcpu_halt(void)
diff --git a/plat/common/memory.c b/plat/common/memory.c
index 30983a75..c46a4b0e 100644
--- a/plat/common/memory.c
+++ b/plat/common/memory.c
@@ -33,7 +33,7 @@
  */
 
 #include <uk/plat/memory.h>
-#include <memory.h>
+#include <uk/plat/common/memory.h>
 
 static struct uk_alloc *plat_allocator;
 
diff --git a/plat/common/pci_bus.c b/plat/common/pci_bus.c
index eda384bb..4077e3c0 100644
--- a/plat/common/pci_bus.c
+++ b/plat/common/pci_bus.c
@@ -54,7 +54,7 @@
 
 #include <string.h>
 #include <uk/print.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 #include <pci/pci_bus.h>
 
 struct pci_bus_handler {
diff --git a/plat/common/sw_ctx.c b/plat/common/sw_ctx.c
index 2c78abe8..482e99e6 100644
--- a/plat/common/sw_ctx.c
+++ b/plat/common/sw_ctx.c
@@ -35,10 +35,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <uk/plat/thread.h>
-#include <sw_ctx.h>
+#include <uk/plat/common/sw_ctx.h>
 #include <uk/assert.h>
-#include <tls.h>
-#include <cpu.h>
+#include <uk/plat/common/tls.h>
+#include <uk/plat/common/cpu.h>
 
 static void *sw_ctx_create(struct uk_alloc *allocator, unsigned long sp,
                                unsigned long tlsp);
diff --git a/plat/common/thread.c b/plat/common/thread.c
index 702338ec..ccfeb296 100644
--- a/plat/common/thread.c
+++ b/plat/common/thread.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <uk/plat/thread.h>
 #include <uk/alloc.h>
-#include <sw_ctx.h>
+#include <uk/plat/common/sw_ctx.h>
 #include <uk/assert.h>
 
 void ukplat_thread_ctx_destroy(struct uk_alloc *allocator, void *ctx)
diff --git a/plat/common/x86/thread_start.S b/plat/common/x86/thread_start.S
index a6ab297e..b23666ae 100644
--- a/plat/common/x86/thread_start.S
+++ b/plat/common/x86/thread_start.S
@@ -26,7 +26,7 @@
  */
 /* Taken from Mini-OS arch/x86/x86_64.S */
 
-#include <sw_ctx.h>
+#include <uk/plat/common/sw_ctx.h>
 
 #define ENTRY(X) .globl X ; X :
 
diff --git a/plat/common/x86/trace.c b/plat/common/x86/trace.c
index dacf1ef0..ef2102e9 100644
--- a/plat/common/x86/trace.c
+++ b/plat/common/x86/trace.c
@@ -32,7 +32,7 @@
  * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
-#include <trace.h>
+#include <uk/plat/common/trace.h>
 #include <uk/print.h>
 
 #define PAGE_SIZE 4096 /* TODO take this from another header */
diff --git a/plat/common/x86/traps.c b/plat/common/x86/traps.c
index cfb120f6..3af9c499 100644
--- a/plat/common/x86/traps.c
+++ b/plat/common/x86/traps.c
@@ -34,7 +34,7 @@
 /* Ported from Mini-OS */
 
 #include <uk/arch/lcpu.h>
-#include <trace.h>
+#include <uk/plat/common/trace.h>
 #include <x86/cpu.h>
 #include <x86/traps.h>
 #include <uk/print.h>
diff --git a/plat/drivers/gic/gic-v2.c b/plat/drivers/gic/gic-v2.c
index c01c92f6..2428be03 100644
--- a/plat/drivers/gic/gic-v2.c
+++ b/plat/drivers/gic/gic-v2.c
@@ -39,7 +39,7 @@
 #include <uk/assert.h>
 #include <uk/bitops.h>
 #include <uk/asm.h>
-#include <irq.h>
+#include <uk/plat/common/irq.h>
 #include <kvm/irq.h>
 #include <uk/plat/lcpu.h>
 #include <arm/cpu.h>
diff --git a/plat/drivers/include/virtio/virtio_config.h 
b/plat/drivers/include/virtio/virtio_config.h
index 1c4e7efc..1221bbc5 100644
--- a/plat/drivers/include/virtio/virtio_config.h
+++ b/plat/drivers/include/virtio/virtio_config.h
@@ -36,7 +36,7 @@
 #define __PLAT_DRV_VIRTIO_CONFIG_H
 
 #include <uk/arch/types.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plat/drivers/virtio/virtio_ring.c 
b/plat/drivers/virtio/virtio_ring.c
index 56b1b6cd..a310a431 100644
--- a/plat/drivers/virtio/virtio_ring.c
+++ b/plat/drivers/virtio/virtio_ring.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <uk/print.h>
 #include <uk/errptr.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 #include <uk/sglist.h>
 #include <uk/arch/atomic.h>
 #include <uk/plat/io.h>
diff --git a/plat/kvm/arm/entry64.S b/plat/kvm/arm/entry64.S
index ff63ee0f..359a3105 100644
--- a/plat/kvm/arm/entry64.S
+++ b/plat/kvm/arm/entry64.S
@@ -35,7 +35,7 @@
 #include <uk/asm.h>
 #include <kvm-arm/mm.h>
 #include <arm/cpu_defs.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 
 .global page_table_size
 .data
diff --git a/plat/kvm/arm/link64.lds.S b/plat/kvm/arm/link64.lds.S
index 8fe3ad85..4f8fcc30 100644
--- a/plat/kvm/arm/link64.lds.S
+++ b/plat/kvm/arm/link64.lds.S
@@ -32,7 +32,7 @@
  * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #include <uk/arch/limits.h>
-#include <common.lds.h>
+#include <uk/plat/common/common.lds.h>
 
 /* QEMU-AArch64 virt platform's ram base address */
 #define RAM_BASE_ADDR 0x40000000
diff --git a/plat/kvm/arm/setup.c b/plat/kvm/arm/setup.c
index 3046646d..41e63755 100644
--- a/plat/kvm/arm/setup.c
+++ b/plat/kvm/arm/setup.c
@@ -20,7 +20,7 @@
  */
 #include <uk/config.h>
 #include <libfdt.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #include <kvm/console.h>
 #include <kvm/config.h>
 #include <uk/assert.h>
diff --git a/plat/kvm/irq.c b/plat/kvm/irq.c
index 32042afc..8f43aa6f 100644
--- a/plat/kvm/irq.c
+++ b/plat/kvm/irq.c
@@ -29,8 +29,8 @@
 #include <uk/alloc.h>
 #include <uk/list.h>
 #include <uk/plat/lcpu.h>
-#include <cpu.h>
-#include <irq.h>
+#include <uk/plat/common/cpu.h>
+#include <uk/plat/common/irq.h>
 #include <kvm/irq.h>
 #include <kvm/intctrl.h>
 #include <uk/assert.h>
diff --git a/plat/kvm/memory.c b/plat/kvm/memory.c
index 7f2fb46a..1d9269ec 100644
--- a/plat/kvm/memory.c
+++ b/plat/kvm/memory.c
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #include <sys/types.h>
 #include <uk/plat/memory.h>
 #include <uk/assert.h>
diff --git a/plat/kvm/shutdown.c b/plat/kvm/shutdown.c
index 4d8def0e..cce26b7d 100644
--- a/plat/kvm/shutdown.c
+++ b/plat/kvm/shutdown.c
@@ -22,8 +22,8 @@
  */
 
 #include <errno.h>
-#include <cpu.h>
-#include <irq.h>
+#include <uk/plat/common/cpu.h>
+#include <uk/plat/common/irq.h>
 #include <uk/print.h>
 #include <uk/plat/bootstrap.h>
 
diff --git a/plat/kvm/x86/link64.lds.S b/plat/kvm/x86/link64.lds.S
index 1f661042..eb4a19d2 100644
--- a/plat/kvm/x86/link64.lds.S
+++ b/plat/kvm/x86/link64.lds.S
@@ -24,7 +24,7 @@
  */
 
 #include <uk/arch/limits.h> /* for __PAGE_SIZE */
-#include <common.lds.h>
+#include <uk/plat/common/common.lds.h>
 
 ENTRY(_libkvmplat_entry)
 SECTIONS
diff --git a/plat/kvm/x86/setup.c b/plat/kvm/x86/setup.c
index e4becaaa..44eb7adc 100644
--- a/plat/kvm/x86/setup.c
+++ b/plat/kvm/x86/setup.c
@@ -27,7 +27,7 @@
  */
 
 #include <string.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #include <x86/cpu.h>
 #include <x86/traps.h>
 #include <kvm/config.h>
diff --git a/plat/linuxu/arm/link.lds.S b/plat/linuxu/arm/link.lds.S
index f20cc7c8..6d4fe333 100644
--- a/plat/linuxu/arm/link.lds.S
+++ b/plat/linuxu/arm/link.lds.S
@@ -1,4 +1,4 @@
-#include <common.lds.h>
+#include <uk/plat/common/common.lds.h>
 
 SECTIONS
 {
diff --git a/plat/linuxu/lcpu.c b/plat/linuxu/lcpu.c
index 8b709207..b545ca8d 100644
--- a/plat/linuxu/lcpu.c
+++ b/plat/linuxu/lcpu.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <uk/plat/lcpu.h>
-#include <_time.h>
+#include <uk/plat/common/_time.h>
 #include <linuxu/time.h>
 #include <linuxu/syscall.h>
 #include <uk/print.h>
diff --git a/plat/linuxu/setup.c b/plat/linuxu/setup.c
index 863d30ff..4e224a3d 100644
--- a/plat/linuxu/setup.c
+++ b/plat/linuxu/setup.c
@@ -43,7 +43,7 @@
 #include <uk/plat/bootstrap.h>
 #include <uk/assert.h>
 #include <uk/errptr.h>
-#include <cpu.h>
+#include <uk/plat/common/cpu.h>
 
 struct liblinuxuplat_opts _liblinuxuplat_opts = { 0 };
 
diff --git a/plat/linuxu/x86/link64.lds.S b/plat/linuxu/x86/link64.lds.S
index 80120084..ad41fd31 100644
--- a/plat/linuxu/x86/link64.lds.S
+++ b/plat/linuxu/x86/link64.lds.S
@@ -1,4 +1,4 @@
-#include <common.lds.h>
+#include <uk/plat/common/common.lds.h>
 
 SECTIONS
 {
diff --git a/plat/xen/arm/link32.lds.S b/plat/xen/arm/link32.lds.S
index 30c29ab9..15f1c499 100644
--- a/plat/xen/arm/link32.lds.S
+++ b/plat/xen/arm/link32.lds.S
@@ -24,7 +24,7 @@
  */
 /* Taken from Mini-OS */
 
-#include <common.lds.h>
+#include <uk/plat/common/common.lds.h>
 
 OUTPUT_ARCH(arm)
 ENTRY(_libxenplat_start)
diff --git a/plat/xen/arm/setup.c b/plat/xen/arm/setup.c
index 410da923..2df3b46c 100644
--- a/plat/xen/arm/setup.c
+++ b/plat/xen/arm/setup.c
@@ -25,7 +25,7 @@
 /* Ported from Mini-OS */
 
 #include <string.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #include <xen-arm/os.h>
 #include <xen-arm/mm.h>
 #include <xen/xen.h>
diff --git a/plat/xen/include/xen-arm/mm.h b/plat/xen/include/xen-arm/mm.h
index 4de76f41..659de843 100644
--- a/plat/xen/include/xen-arm/mm.h
+++ b/plat/xen/include/xen-arm/mm.h
@@ -28,7 +28,7 @@
 #define _ARCH_MM_H_
 
 #include <stdint.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #include <uk/arch/limits.h>
 
 typedef uint64_t paddr_t;
diff --git a/plat/xen/include/xen-x86/mm.h b/plat/xen/include/xen-x86/mm.h
index 32d876a1..ffbedb09 100644
--- a/plat/xen/include/xen-x86/mm.h
+++ b/plat/xen/include/xen-x86/mm.h
@@ -25,7 +25,7 @@
 #ifndef _ARCH_MM_H_
 #define _ARCH_MM_H_
 
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #ifndef __ASSEMBLY__
 #include <xen/xen.h>
 #if defined(__i386__)
diff --git a/plat/xen/memory.c b/plat/xen/memory.c
index 709c04c8..8e7a7dda 100644
--- a/plat/xen/memory.c
+++ b/plat/xen/memory.c
@@ -34,7 +34,7 @@
  */
 
 #include <string.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 
 #include <common/gnttab.h>
 #if (defined __X86_32__) || (defined __X86_64__)
diff --git a/plat/xen/x86/arch_time.c b/plat/xen/x86/arch_time.c
index 1c87be4f..25a7721b 100644
--- a/plat/xen/x86/arch_time.c
+++ b/plat/xen/x86/arch_time.c
@@ -38,7 +38,7 @@
 #include <time.h>
 #include <uk/plat/time.h>
 #include <x86/cpu.h>
-#include <_time.h>
+#include <uk/plat/common/_time.h>
 #include <common/hypervisor.h>
 #include <common/events.h>
 #include <xen-x86/irq.h>
diff --git a/plat/xen/x86/link64.lds.S b/plat/xen/x86/link64.lds.S
index 3e16b3bd..2054e6af 100644
--- a/plat/xen/x86/link64.lds.S
+++ b/plat/xen/x86/link64.lds.S
@@ -24,7 +24,7 @@
 /* Taken from Mini-OS */
 
 #include <uk/arch/limits.h> /* for __PAGE_SIZE */
-#include <common.lds.h>
+#include <uk/plat/common/common.lds.h>
 
 OUTPUT_FORMAT("elf64-x86-64")
 OUTPUT_ARCH(i386:x86-64)
diff --git a/plat/xen/x86/mm.c b/plat/xen/x86/mm.c
index dc9cc75c..94f2fe20 100644
--- a/plat/xen/x86/mm.c
+++ b/plat/xen/x86/mm.c
@@ -36,7 +36,7 @@
  */
 
 #include <string.h>
-#include <sections.h>
+#include <uk/plat/common/sections.h>
 #include <errno.h>
 #include <uk/alloc.h>
 #include <uk/plat/config.h>
-- 
2.17.1


_______________________________________________
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.

Rackspace

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