Pull xen updates from Juergen Gross: "This contains some minor code cleanups (fixing return types of functions), some fixes for Linux running as Xen PVH guest, and adding of a new guest resource mapping feature for Xen tools" * tag 'for-linus-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/PVH: Make GDT selectors PVH-specific xen/PVH: Set up GS segment for stack canary xen/store: do not store local values in xen_start_info xen-netfront: fix xennet_start_xmit()'s return type xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE xen: Change return type to vm_fault_t
Showing the changes to include/uapi (1 of 10 files). Show all
Unified · Split
| @@ -89,6 +89,15 @@ struct privcmd_dm_op { · 88 unmodified lines | ||
| 89 | 89 | const struct privcmd_dm_op_buf __user *ubufs; |
| 90 | 90 | }; |
| 91 | 91 | |
| 92 | +struct privcmd_mmap_resource { | |
| 93 | + domid_t dom; | |
| 94 | + __u32 type; | |
| 95 | + __u32 id; | |
| 96 | + __u32 idx; | |
| 97 | + __u64 num; | |
| 98 | + __u64 addr; | |
| 99 | +}; | |
| 100 | + | |
| 92 | 101 | /* |
| 93 | 102 | * @cmd: IOCTL_PRIVCMD_HYPERCALL |
| 94 | 103 | * @arg: &privcmd_hypercall_t |
| @@ -114,5 +123,7 @@ struct privcmd_dm_op { · 19 unmodified lines | ||
| 114 | 123 | _IOC(_IOC_NONE, 'P', 5, sizeof(struct privcmd_dm_op)) |
| 115 | 124 | #define IOCTL_PRIVCMD_RESTRICT \ |
| 116 | 125 | _IOC(_IOC_NONE, 'P', 6, sizeof(domid_t)) |
| 126 | +#define IOCTL_PRIVCMD_MMAP_RESOURCE \ | |
| 127 | + _IOC(_IOC_NONE, 'P', 7, sizeof(struct privcmd_mmap_resource)) | |
| 117 | 128 | |
| 118 | 129 | #endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ |