diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-02-22 13:36:17 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-03-01 12:15:28 +0100 |
| commit | 66fb2d5467cc93feecc12d3bbab860d7615b6616 (patch) | |
| tree | d0c50ac84a5776eae7507155ba1af8b6d5c24c1a /linux-headers/linux/vfio.h | |
| parent | 9c74a853048f14fd9a3e2efa1e3a6935d00e7495 (diff) | |
| download | qemu-66fb2d5467cc93feecc12d3bbab860d7615b6616.zip | |
linux-headers: update against kvm/next
Update against commit efef127c, but keep userfaultd.h.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'linux-headers/linux/vfio.h')
| -rw-r--r-- | linux-headers/linux/vfio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index aa276bce39..15e096c43a 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -39,6 +39,13 @@ #define VFIO_SPAPR_TCE_v2_IOMMU 7 /* + * The No-IOMMU IOMMU offers no translation or isolation for devices and + * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU + * code will taint the host kernel and should be used with extreme caution. + */ +#define VFIO_NOIOMMU_IOMMU 8 + +/* * The IOCTL interface is designed for extensibility by embedding the * structure length (argsz) and flags into structures passed between * kernel and userspace. We therefore use the _IO() macro for these @@ -568,8 +575,10 @@ struct vfio_iommu_spapr_tce_create { __u32 flags; /* in */ __u32 page_shift; + __u32 __resv1; __u64 window_size; __u32 levels; + __u32 __resv2; /* out */ __u64 start_addr; }; |