Merge our KVM topic branch.
Showing the changes to include/uapi (1 of 6 files). Show all
Unified · Split
| @@ -1221,9 +1221,9 @@ struct kvm_vfio_spapr_tce { · 1220 unmodified lines | |||
| 1221 | /* Available with KVM_CAP_SPAPR_RESIZE_HPT */ | 1221 | /* Available with KVM_CAP_SPAPR_RESIZE_HPT */ |
| 1222 | #define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt) | 1222 | #define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt) |
| 1223 | #define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt) | 1223 | #define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt) |
| 1224 | /* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */ | 1224 | /* Available with KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3 */ |
| 1225 | #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg) | 1225 | #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg) |
| 1226 | /* Available with KVM_CAP_PPC_RADIX_MMU */ | 1226 | /* Available with KVM_CAP_PPC_MMU_RADIX */ |
| 1227 | #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info) | 1227 | #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info) |
| 1228 | /* Available with KVM_CAP_PPC_GET_CPU_CHAR */ | 1228 | /* Available with KVM_CAP_PPC_GET_CPU_CHAR */ |
| 1229 | #define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char) | 1229 | #define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char) |