d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: switch to use headers in contrib

Browse Source 
These headers originate with the Xen project and shouldn't be mixed with
the main portion of the FreeBSD kernel. Notably they shouldn't be the
target of clean-up commits.

Switch to use the headers in sys/contrib/xen.

Reviewed by: royger
This commit is contained in:
Elliott Mitchell 2021-10-12 19:00:26 -07:00 committed by Roger Pau Monné
parent 3a9fd8242b
commit ad7dd51499
25 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/amd64/xen-locore.S
View File

@ -38,7 +38,7 @@
#include <xen/xen-os.h>
#define __ASSEMBLY__
#include <xen/interface/elfnote.h>
#include <contrib/xen/elfnote.h>
#include "assym.inc"

6
sys/dev/xen/blkback/blkback.c
View File

@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$");
#include <xen/gnttab.h>
#include <xen/xen_intr.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/grant_table.h>
#include <contrib/xen/event_channel.h>
#include <contrib/xen/grant_table.h>
#include <xen/xenbus/xenbusvar.h>
@ -1280,7 +1280,7 @@ xbb_get_resources(struct xbb_softc *xbb, struct xbb_xen_reqlist **reqlist,
* \param xbb Per-instance xbb configuration structure.
* \param req The request structure to which to respond.
* \param status The status code to report. See BLKIF_RSP_*
* in sys/xen/interface/io/blkif.h.
* in sys/contrib/xen/io/blkif.h.
*/
static void
xbb_queue_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status)

4
sys/dev/xen/blkfront/blkfront.c
View File

@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
#include <xen/gnttab.h>
#include <xen/interface/grant_table.h>
#include <xen/interface/io/protocols.h>
#include <contrib/xen/grant_table.h>
#include <contrib/xen/io/protocols.h>
#include <xen/xenbus/xenbusvar.h>
#include <machine/_inttypes.h>

2
sys/dev/xen/console/xen_console.c
View File

@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <xen/xen-os.h>
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
#include <xen/interface/io/console.h>
#include <contrib/xen/io/console.h>
#include "opt_ddb.h"
#include "opt_printf.h"

4
sys/dev/xen/control/control.c
View File

@ -148,8 +148,8 @@ __FBSDID("$FreeBSD$");
#include <xen/hvm.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/grant_table.h>
#include <contrib/xen/event_channel.h>
#include <contrib/xen/grant_table.h>
#include <xen/xenbus/xenbusvar.h>

2
sys/dev/xen/efi/pvefi.c
View File

@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <xen/error.h>
#include <xen/hypervisor.h>
#include <xen/interface/platform.h>
#include <contrib/xen/platform.h>
extern char bootmethod[16];

2
sys/dev/xen/netback/netback.c
View File

@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
#include <xen/xen-os.h>
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
#include <xen/interface/io/netif.h>
#include <contrib/xen/io/netif.h>
#include <xen/xenbus/xenbusvar.h>
/*--------------------------- Compile-time Tunables --------------------------*/

4
sys/dev/xen/netfront/netfront.c
View File

@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$");
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
#include <xen/gnttab.h>
#include <xen/interface/memory.h>
#include <xen/interface/io/netif.h>
#include <contrib/xen/memory.h>
#include <contrib/xen/io/netif.h>
#include <xen/xenbus/xenbusvar.h>
#include "xenbus_if.h"

4
sys/dev/xen/timer/timer.c
View File

@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
#include <xen/features.h>
#include <xen/xen_intr.h>
#include <xen/hypervisor.h>
#include <xen/interface/io/xenbus.h>
#include <xen/interface/vcpu.h>
#include <contrib/xen/io/xenbus.h>
#include <contrib/xen/vcpu.h>
#include <xen/error.h>
#include <machine/cpu.h>

2
sys/dev/xen/xenstore/xenstore.c
View File

@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
#include <xen/interface/hvm/params.h>
#include <contrib/xen/hvm/params.h>
#include <xen/hvm.h>
#include <xen/xenstore/xenstorevar.h>

4
sys/i386/include/xen/hypercall.h
View File

@ -31,8 +31,8 @@
#define __HYPERCALL_H__
#include <sys/systm.h>
#include <xen/interface/xen.h>
#include <xen/interface/sched.h>
#include <contrib/xen/xen.h>
#include <contrib/xen/sched.h>
extern char *hypercall_page;

6
sys/x86/xen/hvm.c
View File

@ -58,9 +58,9 @@ __FBSDID("$FreeBSD$");
#include <xen/hvm.h>
#include <xen/xen_intr.h>
#include <xen/interface/arch-x86/cpuid.h>
#include <xen/interface/hvm/params.h>
#include <xen/interface/vcpu.h>
#include <contrib/xen/arch-x86/cpuid.h>
#include <contrib/xen/hvm/params.h>
#include <contrib/xen/vcpu.h>
/*--------------------------- Forward Declarations ---------------------------*/
static void xen_hvm_cpu_init(void);

4
sys/x86/xen/pv.c
View File

@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$");
#include <xen/xenstore/xenstorevar.h>
#include <xen/xen_pv.h>
#include <xen/interface/arch-x86/hvm/start_info.h>
#include <xen/interface/vcpu.h>
#include <contrib/xen/arch-x86/hvm/start_info.h>
#include <contrib/xen/vcpu.h>
#include <dev/xen/timer/timer.h>

4
sys/x86/xen/xen_apic.c
View File

@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
#include <xen/hvm.h>
#include <xen/xen_intr.h>
#include <xen/interface/arch-x86/cpuid.h>
#include <xen/interface/vcpu.h>
#include <contrib/xen/arch-x86/cpuid.h>
#include <contrib/xen/vcpu.h>
/*--------------------------- Forward Declarations ---------------------------*/
static driver_filter_t xen_smp_rendezvous_action;

6
sys/xen/blkif.h
View File

@ -23,9 +23,9 @@
#ifndef __XEN_BLKIF_H__
#define __XEN_BLKIF_H__
#include <xen/interface/io/ring.h>
#include <xen/interface/io/blkif.h>
#include <xen/interface/io/protocols.h>
#include <contrib/xen/io/ring.h>
#include <contrib/xen/io/blkif.h>
#include <contrib/xen/io/protocols.h>
/* Not a real protocol. Used to generate ring structs which contain
* the elements common to all protocols only. This way we get a

2
sys/xen/error.h
View File

@ -29,7 +29,7 @@
#ifndef __XEN_ERROR_H__
#define __XEN_ERROR_H__
#include <xen/interface/errno.h>
#include <contrib/xen/errno.h>
/* Translation table */
static int xen_errors[] =

2
sys/xen/evtchn/evtchnvar.h
View File

@ -35,7 +35,7 @@
#define __XEN_EVTCHN_EVTCHNVAR_H__
#include <xen/hypervisor.h>
#include <xen/interface/event_channel.h>
#include <contrib/xen/event_channel.h>
enum evtchn_type {
EVTCHN_TYPE_UNBOUND,

2
sys/xen/features.h
View File

@ -9,7 +9,7 @@
#ifndef __ASM_XEN_FEATURES_H__
#define __ASM_XEN_FEATURES_H__
#include <xen/interface/version.h>
#include <contrib/xen/version.h>
extern void setup_xen_features(void);

2
sys/xen/gnttab.h
View File

@ -41,7 +41,7 @@
#include <xen/hypervisor.h>
#include <xen/features.h>
#include <xen/interface/grant_table.h>
#include <contrib/xen/grant_table.h>
#define GNTTAB_LIST_END GRANT_REF_INVALID

4
sys/xen/hvm.h
View File

@ -26,12 +26,12 @@
#include <xen/xen-os.h>
#include <xen/hypervisor.h>
#include <xen/interface/hvm/params.h>
#include <contrib/xen/hvm/params.h>
/**
* \brief Wrapper function to obtain a HVM parameter value.
*
* \param index HVM parameter index; see <xen/interface/hvm/params.h>.
* \param index HVM parameter index; see <contrib/xen/hvm/params.h>.
*
* \returns 0 on failure; the value of the parameter otherwise.
*/

16
sys/xen/hypervisor.h
View File

@ -13,14 +13,14 @@
#include <sys/cdefs.h>
#include <sys/systm.h>
#include <xen/interface/xen.h>
#include <xen/interface/platform.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/physdev.h>
#include <xen/interface/sched.h>
#include <xen/interface/callback.h>
#include <xen/interface/memory.h>
#include <xen/interface/hvm/dm_op.h>
#include <contrib/xen/xen.h>
#include <contrib/xen/platform.h>
#include <contrib/xen/event_channel.h>
#include <contrib/xen/physdev.h>
#include <contrib/xen/sched.h>
#include <contrib/xen/callback.h>
#include <contrib/xen/memory.h>
#include <contrib/xen/hvm/dm_op.h>
#include <machine/xen/hypercall.h>
extern uint64_t get_system_time(int ticks);

4
sys/xen/xen-os.h
View File

@ -38,11 +38,11 @@
#define __ASSEMBLY__
#endif
#include <xen/interface/xen.h>
#include <contrib/xen/xen.h>
#ifndef __ASSEMBLY__
#include <xen/hvm.h>
#include <xen/interface/event_channel.h>
#include <contrib/xen/event_channel.h>
static inline vm_paddr_t
xen_get_xenstore_mfn(void)

2
sys/xen/xen_intr.h
View File

@ -33,7 +33,7 @@
#ifndef _XEN_INTR_H_
#define _XEN_INTR_H_
#include <xen/interface/event_channel.h>
#include <contrib/xen/event_channel.h>
/** Registered Xen interrupt callback handle. */
typedef void * xen_intr_handle_t;

6
sys/xen/xenbus/xenbusvar.h
View File

@ -45,9 +45,9 @@
#include <machine/stdarg.h>
#include <xen/xen-os.h>
#include <xen/interface/grant_table.h>
#include <xen/interface/io/xenbus.h>
#include <xen/interface/io/xs_wire.h>
#include <contrib/xen/grant_table.h>
#include <contrib/xen/io/xenbus.h>
#include <contrib/xen/io/xs_wire.h>
#include <xen/xenstore/xenstorevar.h>

6
sys/xen/xenstore/xenstorevar.h
View File

@ -43,9 +43,9 @@
#include <machine/stdarg.h>
#include <xen/xen-os.h>
#include <xen/interface/grant_table.h>
#include <xen/interface/io/xenbus.h>
#include <xen/interface/io/xs_wire.h>
#include <contrib/xen/grant_table.h>
#include <contrib/xen/io/xenbus.h>
#include <contrib/xen/io/xs_wire.h>
#include "xenbus_if.h"