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/xen/interface/version.h | |
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/xen/interface/version.h')
-rw-r--r-- | sys/xen/interface/version.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/xen/interface/version.h b/sys/xen/interface/version.h index 8742c2b..44f26b0 100644 --- a/sys/xen/interface/version.h +++ b/sys/xen/interface/version.h @@ -28,6 +28,8 @@ #ifndef __XEN_PUBLIC_VERSION_H__ #define __XEN_PUBLIC_VERSION_H__ +#include "xen.h" + /* NB. All ops return zero on success, except XENVER_{version,pagesize} */ /* arg == NULL; returns major:minor (16:16). */ @@ -58,7 +60,7 @@ typedef char xen_changeset_info_t[64]; #define XENVER_platform_parameters 5 struct xen_platform_parameters { - unsigned long virt_start; + xen_ulong_t virt_start; }; typedef struct xen_platform_parameters xen_platform_parameters_t; @@ -86,7 +88,7 @@ typedef char xen_commandline_t[1024]; /* * Local variables: * mode: C - * c-set-style: "BSD" + * c-file-style: "BSD" * c-basic-offset: 4 * tab-width: 4 * indent-tabs-mode: nil |