History

Merge tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen updates from Juergen Gross: "Xen features and fixes: - a series from Boris Ostrovsky adding support for booting Linux as Xen PVH guest - a series from Juergen Gross streamlining the xenbus driver - a series from Paul Durrant adding support for the new device model hypercall - several small corrections" * tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/privcmd: add IOCTL_PRIVCMD_RESTRICT xen/privcmd: Add IOCTL_PRIVCMD_DM_OP xen/privcmd: return -ENOTTY for unimplemented IOCTLs xen: optimize xenbus driver for multiple concurrent xenstore accesses xen: modify xenstore watch event interface xen: clean up xenbus internal headers xenbus: Neaten xenbus_va_dev_error xen/pvh: Use Xen's emergency_restart op for PVH guests xen/pvh: Enable CPU hotplug xen/pvh: PVH guests always have PV devices xen/pvh: Initialize grant table for PVH guests xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI xen/pvh: Bootstrap PVH guest xen/pvh: Import PVH-related Xen public interfaces xen/x86: Remove PVH support x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C xen/manage: correct return value check on xenbus_scanf() x86/xen: Fix APIC id mismatch warning on Intel xen/netback: set default upper limit of tx/rx queues to 8 xen/netfront: set default upper limit of tx/rx queues to 8

Linus Torvalds committed 9 years ago

Commit 252b95c2 parents b8989bc 4610d2449 files · +1726 −967Browse files

Showing the changes to include/uapi (1 of 49 files). Show all

Unified · Split

include/uapi/xen/privcmd.h+15−0
@@ -77,6 +77,17 @@ struct privcmd_mmapbatch_v2 { · 76 unmodified lines
7777 int __user *err; /* array of error codes */
7878 };
7979
80+struct privcmd_dm_op_buf {
81+ void __user *uptr;
82+ size_t size;
83+};
84+
85+struct privcmd_dm_op {
86+ domid_t dom;
87+ __u16 num;
88+ const struct privcmd_dm_op_buf __user *ubufs;
89+};
90+
8091 /*
8192 * @cmd: IOCTL_PRIVCMD_HYPERCALL
8293 * @arg: &privcmd_hypercall_t
@@ -98,5 +109,9 @@ struct privcmd_mmapbatch_v2 { · 15 unmodified lines
98109 _IOC(_IOC_NONE, 'P', 3, sizeof(struct privcmd_mmapbatch))
99110 #define IOCTL_PRIVCMD_MMAPBATCH_V2 \
100111 _IOC(_IOC_NONE, 'P', 4, sizeof(struct privcmd_mmapbatch_v2))
112+#define IOCTL_PRIVCMD_DM_OP \
113+ _IOC(_IOC_NONE, 'P', 5, sizeof(struct privcmd_dm_op))
114+#define IOCTL_PRIVCMD_RESTRICT \
115+ _IOC(_IOC_NONE, 'P', 6, sizeof(domid_t))
101116
102117 #endif /* __LINUX_PUBLIC_PRIVCMD_H__ */