Skip to content

Commit fbef99b

Browse files
soburisoburi
committed
modules: add and migrate to the Xen module
Currently, the MIT-licensed Xen public headers were incorporated under the `include/zephyr/xen/public`. However, the recent policy is to not include sources other than Apache-2 in the main tree, so we will externalize them. Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
1 parent 08bfd26 commit fbef99b

28 files changed

+50
-2546
lines changed

‎MAINTAINERS.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5659,6 +5659,19 @@ West:
56595659
- "area: Networking"
56605660
- "area: Crypto / RNG"
56615661

5662+
"West project: xen":
5663+
status: maintained
5664+
maintainers:
5665+
- firscity
5666+
collaborators:
5667+
- lorc
5668+
- luca-fancellu
5669+
- soburi
5670+
files:
5671+
- modules/xen/
5672+
labels:
5673+
- "area: Xen Platform"
5674+
56625675
"West project: zcbor":
56635676
status: maintained
56645677
maintainers:

‎arch/arm64/core/xen/enlighten.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <zephyr/arch/arm64/hypercall.h>
88
#include <zephyr/xen/events.h>
99
#include <zephyr/xen/generic.h>
10-
#include <zephyr/xen/public/xen.h>
11-
#include <zephyr/xen/public/memory.h>
10+
#include <xen/public/xen.h>
11+
#include <xen/public/memory.h>
1212

1313
#include <zephyr/device.h>
1414
#include <zephyr/init.h>

‎arch/arm64/core/xen/hypercall.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <zephyr/toolchain.h>
77
#include <zephyr/linker/sections.h>
8-
#include <zephyr/xen/public/arch-arm.h>
9-
#include <zephyr/xen/public/xen.h>
8+
#include <xen/public/arch-arm.h>
9+
#include <xen/public/xen.h>
1010

1111
#define HYPERCALL(hypercall) \
1212
GTEXT(HYPERVISOR_##hypercall); \

‎drivers/serial/uart_hvc_xen.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#include <zephyr/xen/events.h>
1010
#include <zephyr/xen/generic.h>
1111
#include <zephyr/xen/hvm.h>
12-
#include <zephyr/xen/public/io/console.h>
13-
#include <zephyr/xen/public/sched.h>
14-
#include <zephyr/xen/public/xen.h>
12+
#include <xen/public/io/console.h>
13+
#include <xen/public/sched.h>
14+
#include <xen/public/xen.h>
1515

1616
#include <zephyr/device.h>
1717
#include <zephyr/init.h>

‎drivers/serial/uart_hvc_xen_consoleio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
#include <zephyr/arch/arm64/hypercall.h>
13-
#include <zephyr/xen/public/xen.h>
13+
#include <xen/public/xen.h>
1414

1515
#include <zephyr/device.h>
1616
#include <zephyr/drivers/uart.h>

‎drivers/xen/dom0/domctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <zephyr/arch/arm64/hypercall.h>
88
#include <zephyr/xen/dom0/domctl.h>
99
#include <zephyr/xen/generic.h>
10-
#include <zephyr/xen/public/domctl.h>
11-
#include <zephyr/xen/public/xen.h>
10+
#include <xen/public/domctl.h>
11+
#include <xen/public/xen.h>
1212

1313
#include <zephyr/init.h>
1414
#include <zephyr/kernel.h>

‎drivers/xen/events.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
#include <zephyr/arch/arm64/hypercall.h>
9-
#include <zephyr/xen/public/xen.h>
10-
#include <zephyr/xen/public/event_channel.h>
9+
#include <xen/public/xen.h>
10+
#include <xen/public/event_channel.h>
1111
#include <zephyr/xen/events.h>
1212
#include <zephyr/sys/barrier.h>
1313

‎drivers/xen/gnttab.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <zephyr/arch/arm64/hypercall.h>
2121
#include <zephyr/xen/generic.h>
2222
#include <zephyr/xen/gnttab.h>
23-
#include <zephyr/xen/public/grant_table.h>
24-
#include <zephyr/xen/public/memory.h>
25-
#include <zephyr/xen/public/xen.h>
23+
#include <xen/public/grant_table.h>
24+
#include <xen/public/memory.h>
25+
#include <xen/public/xen.h>
2626
#include <zephyr/sys/barrier.h>
2727

2828
#include <zephyr/init.h>

‎drivers/xen/hvm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include <zephyr/arch/arm64/hypercall.h>
88
#include <zephyr/xen/hvm.h>
9-
#include <zephyr/xen/public/hvm/hvm_op.h>
10-
#include <zephyr/xen/public/hvm/params.h>
9+
#include <xen/public/hvm/hvm_op.h>
10+
#include <xen/public/hvm/params.h>
1111

1212
#include <zephyr/kernel.h>
1313

‎drivers/xen/memory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <zephyr/arch/arm64/hypercall.h>
77
#include <zephyr/xen/generic.h>
8-
#include <zephyr/xen/public/memory.h>
9-
#include <zephyr/xen/public/xen.h>
8+
#include <xen/public/memory.h>
9+
#include <xen/public/xen.h>
1010

1111
#include <zephyr/kernel.h>
1212

0 commit comments

Comments
 (0)