No conflicts.
Showing the changes to tools/include/uapi/linux (1 of 746 files). Show all
Unified · Split
| @@ -1131,7 +1131,8 @@ struct kvm_ppc_resize_hpt { · 1130 unmodified lines | |||
| 1131 | #define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204 | 1131 | #define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204 |
| 1132 | #define KVM_CAP_ARM_MTE 205 | 1132 | #define KVM_CAP_ARM_MTE 205 |
| 1133 | #define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206 | 1133 | #define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206 |
| 1134 | #define KVM_CAP_XSAVE2 207 | 1134 | #define KVM_CAP_VM_GPA_BITS 207 |
| 1135 | #define KVM_CAP_XSAVE2 208 | ||
| 1135 | 1136 | ||
| 1136 | #ifdef KVM_CAP_IRQ_ROUTING | 1137 | #ifdef KVM_CAP_IRQ_ROUTING |
| 1137 | 1138 | ||
| @@ -1163,11 +1164,20 @@ struct kvm_irq_routing_hv_sint { · 25 unmodified lines | |||
| 1163 | __u32 sint; | 1164 | __u32 sint; |
| 1164 | }; | 1165 | }; |
| 1165 | 1166 | ||
| 1167 | struct kvm_irq_routing_xen_evtchn { | ||
| 1168 | __u32 port; | ||
| 1169 | __u32 vcpu; | ||
| 1170 | __u32 priority; | ||
| 1171 | }; | ||
| 1172 | |||
| 1173 | #define KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ((__u32)(-1)) | ||
| 1174 | |||
| 1166 | /* gsi routing entry types */ | 1175 | /* gsi routing entry types */ |
| 1167 | #define KVM_IRQ_ROUTING_IRQCHIP 1 | 1176 | #define KVM_IRQ_ROUTING_IRQCHIP 1 |
| 1168 | #define KVM_IRQ_ROUTING_MSI 2 | 1177 | #define KVM_IRQ_ROUTING_MSI 2 |
| 1169 | #define KVM_IRQ_ROUTING_S390_ADAPTER 3 | 1178 | #define KVM_IRQ_ROUTING_S390_ADAPTER 3 |
| 1170 | #define KVM_IRQ_ROUTING_HV_SINT 4 | 1179 | #define KVM_IRQ_ROUTING_HV_SINT 4 |
| 1180 | #define KVM_IRQ_ROUTING_XEN_EVTCHN 5 | ||
| 1171 | 1181 | ||
| 1172 | struct kvm_irq_routing_entry { | 1182 | struct kvm_irq_routing_entry { |
| 1173 | __u32 gsi; | 1183 | __u32 gsi; |
| @@ -1179,6 +1189,7 @@ struct kvm_irq_routing_entry { · 5 unmodified lines | |||
| 1179 | struct kvm_irq_routing_msi msi; | 1189 | struct kvm_irq_routing_msi msi; |
| 1180 | struct kvm_irq_routing_s390_adapter adapter; | 1190 | struct kvm_irq_routing_s390_adapter adapter; |
| 1181 | struct kvm_irq_routing_hv_sint hv_sint; | 1191 | struct kvm_irq_routing_hv_sint hv_sint; |
| 1192 | struct kvm_irq_routing_xen_evtchn xen_evtchn; | ||
| 1182 | __u32 pad[8]; | 1193 | __u32 pad[8]; |
| 1183 | } u; | 1194 | } u; |
| 1184 | }; | 1195 | }; |
| @@ -1209,6 +1220,7 @@ struct kvm_x86_mce { · 24 unmodified lines | |||
| 1209 | #define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1) | 1220 | #define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1) |
| 1210 | #define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2) | 1221 | #define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2) |
| 1211 | #define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3) | 1222 | #define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3) |
| 1223 | #define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4) | ||
| 1212 | 1224 | ||
| 1213 | struct kvm_xen_hvm_config { | 1225 | struct kvm_xen_hvm_config { |
| 1214 | __u32 flags; | 1226 | __u32 flags; |
| @@ -1552,8 +1564,6 @@ struct kvm_s390_ucas_mapping { · 337 unmodified lines | |||
| 1552 | /* Available with KVM_CAP_XSAVE */ | 1564 | /* Available with KVM_CAP_XSAVE */ |
| 1553 | #define KVM_GET_XSAVE _IOR(KVMIO, 0xa4, struct kvm_xsave) | 1565 | #define KVM_GET_XSAVE _IOR(KVMIO, 0xa4, struct kvm_xsave) |
| 1554 | #define KVM_SET_XSAVE _IOW(KVMIO, 0xa5, struct kvm_xsave) | 1566 | #define KVM_SET_XSAVE _IOW(KVMIO, 0xa5, struct kvm_xsave) |
| 1555 | /* Available with KVM_CAP_XSAVE2 */ | ||
| 1556 | #define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave) | ||
| 1557 | /* Available with KVM_CAP_XCRS */ | 1567 | /* Available with KVM_CAP_XCRS */ |
| 1558 | #define KVM_GET_XCRS _IOR(KVMIO, 0xa6, struct kvm_xcrs) | 1568 | #define KVM_GET_XCRS _IOR(KVMIO, 0xa6, struct kvm_xcrs) |
| 1559 | #define KVM_SET_XCRS _IOW(KVMIO, 0xa7, struct kvm_xcrs) | 1569 | #define KVM_SET_XCRS _IOW(KVMIO, 0xa7, struct kvm_xcrs) |
| @@ -1613,6 +1623,9 @@ struct kvm_enc_region { · 53 unmodified lines | |||
| 1613 | #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3) | 1623 | #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3) |
| 1614 | #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) | 1624 | #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) |
| 1615 | 1625 | ||
| 1626 | /* Available with KVM_CAP_XSAVE2 */ | ||
| 1627 | #define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave) | ||
| 1628 | |||
| 1616 | struct kvm_s390_pv_sec_parm { | 1629 | struct kvm_s390_pv_sec_parm { |
| 1617 | __u64 origin; | 1630 | __u64 origin; |
| 1618 | __u64 length; | 1631 | __u64 length; |