Skip to content

modules: add and migrate to the Xen module #91643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5659,6 +5659,19 @@ West:
- "area: Networking"
- "area: Crypto / RNG"

"West project: xen":
status: maintained
maintainers:
- firscity
collaborators:
- lorc
- luca-fancellu
- soburi
files:
- modules/xen/
labels:
- "area: Xen Platform"

"West project: zcbor":
status: maintained
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/core/xen/enlighten.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/events.h>
#include <zephyr/xen/generic.h>
#include <zephyr/xen/public/xen.h>
#include <zephyr/xen/public/memory.h>
#include <xen/public/xen.h>
#include <xen/public/memory.h>

#include <zephyr/device.h>
#include <zephyr/init.h>
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/core/xen/hypercall.S
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
#include <zephyr/xen/public/arch-arm.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/arch-arm.h>
#include <xen/public/xen.h>

#define HYPERCALL(hypercall) \
GTEXT(HYPERVISOR_##hypercall); \
Expand Down
6 changes: 3 additions & 3 deletions drivers/serial/uart_hvc_xen.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <zephyr/xen/events.h>
#include <zephyr/xen/generic.h>
#include <zephyr/xen/hvm.h>
#include <zephyr/xen/public/io/console.h>
#include <zephyr/xen/public/sched.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/io/console.h>
#include <xen/public/sched.h>
#include <xen/public/xen.h>

#include <zephyr/device.h>
#include <zephyr/init.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/uart_hvc_xen_consoleio.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/xen.h>

#include <zephyr/device.h>
#include <zephyr/drivers/uart.h>
Expand Down
4 changes: 2 additions & 2 deletions drivers/xen/dom0/domctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/dom0/domctl.h>
#include <zephyr/xen/generic.h>
#include <zephyr/xen/public/domctl.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/domctl.h>
#include <xen/public/xen.h>

#include <zephyr/init.h>
#include <zephyr/kernel.h>
Expand Down
4 changes: 2 additions & 2 deletions drivers/xen/events.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*/

#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/public/xen.h>
#include <zephyr/xen/public/event_channel.h>
#include <xen/public/xen.h>
#include <xen/public/event_channel.h>
#include <zephyr/xen/events.h>
#include <zephyr/sys/barrier.h>

Expand Down
6 changes: 3 additions & 3 deletions drivers/xen/gnttab.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/generic.h>
#include <zephyr/xen/gnttab.h>
#include <zephyr/xen/public/grant_table.h>
#include <zephyr/xen/public/memory.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/grant_table.h>
#include <xen/public/memory.h>
#include <xen/public/xen.h>
#include <zephyr/sys/barrier.h>

#include <zephyr/init.h>
Expand Down
4 changes: 2 additions & 2 deletions drivers/xen/hvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/hvm.h>
#include <zephyr/xen/public/hvm/hvm_op.h>
#include <zephyr/xen/public/hvm/params.h>
#include <xen/public/hvm/hvm_op.h>
#include <xen/public/hvm/params.h>

#include <zephyr/kernel.h>

Expand Down
4 changes: 2 additions & 2 deletions drivers/xen/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/generic.h>
#include <zephyr/xen/public/memory.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/memory.h>
#include <xen/public/xen.h>

#include <zephyr/kernel.h>

Expand Down
4 changes: 2 additions & 2 deletions include/zephyr/xen/dom0/domctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#define __XEN_DOM0_DOMCTL_H__

#include <zephyr/xen/generic.h>
#include <zephyr/xen/public/domctl.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/domctl.h>
#include <xen/public/xen.h>

#include <zephyr/kernel.h>

Expand Down
2 changes: 1 addition & 1 deletion include/zephyr/xen/events.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifndef __XEN_EVENTS_H__
#define __XEN_EVENTS_H__

#include <zephyr/xen/public/event_channel.h>
#include <xen/public/event_channel.h>

#include <zephyr/kernel.h>

Expand Down
2 changes: 1 addition & 1 deletion include/zephyr/xen/generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef __XEN_GENERIC_H__
#define __XEN_GENERIC_H__

#include <zephyr/xen/public/xen.h>
#include <xen/public/xen.h>

#define XEN_PAGE_SIZE 4096
#define XEN_PAGE_SHIFT 12
Expand Down
2 changes: 1 addition & 1 deletion include/zephyr/xen/gnttab.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef __XEN_GNTTAB_H__
#define __XEN_GNTTAB_H__

#include <zephyr/xen/public/grant_table.h>
#include <xen/public/grant_table.h>

/*
* Assigns gref and permits access to 4K page for specific domain.
Expand Down
4 changes: 2 additions & 2 deletions include/zephyr/xen/hvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#ifndef __XEN_HVM_H__
#define __XEN_HVM_H__

#include <zephyr/xen/public/hvm/hvm_op.h>
#include <zephyr/xen/public/hvm/params.h>
#include <xen/public/hvm/hvm_op.h>
#include <xen/public/hvm/params.h>

#include <zephyr/kernel.h>

Expand Down
4 changes: 2 additions & 2 deletions include/zephyr/xen/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/

#include <zephyr/kernel.h>
#include <zephyr/xen/public/memory.h>
#include <zephyr/xen/public/xen.h>
#include <xen/public/memory.h>
#include <xen/public/xen.h>

/**
* Add mapping for specified page frame in Xen domain physmap.
Expand Down
Loading
Loading