diff options
| author | royger <royger@FreeBSD.org> | 2015-10-06 11:29:44 +0000 |
|---|---|---|
| committer | royger <royger@FreeBSD.org> | 2015-10-06 11:29:44 +0000 |
| commit | c1bb2e3246dc6cf235535737449549cc16265dda (patch) | |
| tree | 2676d5622b3a36ed986be512a7cda0d369b42c51 /sys/amd64 | |
| parent | 94c16d891ee59ecdc9436e9a5ce921af7f873910 (diff) | |
| download | FreeBSD-src-c1bb2e3246dc6cf235535737449549cc16265dda.zip FreeBSD-src-c1bb2e3246dc6cf235535737449549cc16265dda.tar.gz | |
Update Xen headers from 4.2 to 4.6
Pull the latest headers for Xen which allow us to add support for ARM and
use new features in FreeBSD.
This is a verbatim copy of the xen/include/public so every headers which
don't exits anymore in the Xen repositories have been dropped.
Note the interface version hasn't been bumped, it will be done in a
follow-up. Although, it requires fix in the code to get it compiled:
- sys/xen/xen_intr.h: evtchn_port_t is already defined in the headers so
drop it.
- {amd64,i386}/include/intr_machdep.h: NR_EVENT_CHANNELS now depends on
xen/interface/event_channel.h, so include it.
- {amd64,i386}/{amd64,i386}/support.S: It's not neccessary to include
machine/intr_machdep.h. This is also fixing build compilation with the
new headers.
- dev/xen/blkfront/blkfront.c: The typedef for blkif_request_segmenthas
been dropped. So directly use struct blkif_request_segment
Finally, modify xen/interface/xen-compat.h to throw a preprocessing error if
__XEN_INTERFACE_VERSION__ is not set. This is allow us to catch any file
where xen/xen-os.h is not correctly included.
Submitted by: Julien Grall <julien.grall@citrix.com>
Reviewed by: royger
Differential Revision: https://reviews.freebsd.org/D3805
Sponsored by: Citrix Systems R&D
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/support.S | 1 | ||||
| -rw-r--r-- | sys/amd64/include/intr_machdep.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index f8b75ff..aea25da 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -33,7 +33,6 @@ #include "opt_ddb.h" #include <machine/asmacros.h> -#include <machine/intr_machdep.h> #include <machine/pmap.h> #include "assym.s" diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h index 0a5ced4..d37c795 100644 --- a/sys/amd64/include/intr_machdep.h +++ b/sys/amd64/include/intr_machdep.h @@ -53,6 +53,7 @@ #define FIRST_MSI_INT 256 #ifdef XENHVM #include <xen/xen-os.h> +#include <xen/interface/event_channel.h> #define NUM_EVTCHN_INTS NR_EVENT_CHANNELS #define FIRST_EVTCHN_INT \ (FIRST_MSI_INT + NUM_MSI_INTS) |
