KVM: PPC: Fix documentation for ppc mmu caps

The documentation mentions KVM_CAP_PPC_RADIX_MMU, but the defines in the kvm headers spell it KVM_CAP_PPC_MMU_RADIX. Similarly with KVM_CAP_PPC_MMU_HASH_V3.

Joel Stanley committed 3 years ago

Commit 651d61b1 parent a9c08bc3 files · +7 −7Browse files

Unified · Split

3 files

Documentation/virt/kvm/api.rst +4 −4
include/uapi/linux/kvm.h +2 −2
tools/include/uapi/linux/kvm.h +1 −1

Documentation/virt/kvm/api.rst+4−4

@@ -4300,7 +4300,7 @@ operating system that uses the PIT for timing (e.g. Linux 2.4.x). · 4299 unmodified lines
4300	4.100 KVM_PPC_CONFIGURE_V3_MMU	4300	4.100 KVM_PPC_CONFIGURE_V3_MMU
4301	------------------------------	4301	------------------------------
4302		4302
4303	:Capability: KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3	4303	:Capability: KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3
4304	:Architectures: ppc	4304	:Architectures: ppc
4305	:Type: vm ioctl	4305	:Type: vm ioctl
4306	:Parameters: struct kvm_ppc_mmuv3_cfg (in)	4306	:Parameters: struct kvm_ppc_mmuv3_cfg (in)
@@ -4334,7 +4334,7 @@ the Power ISA V3.00, Book III section 5.7.6.1. · 27 unmodified lines
4334	4.101 KVM_PPC_GET_RMMU_INFO	4334	4.101 KVM_PPC_GET_RMMU_INFO
4335	---------------------------	4335	---------------------------
4336		4336
4337	:Capability: KVM_CAP_PPC_RADIX_MMU	4337	:Capability: KVM_CAP_PPC_MMU_RADIX
4338	:Architectures: ppc	4338	:Architectures: ppc
4339	:Type: vm ioctl	4339	:Type: vm ioctl
4340	:Parameters: struct kvm_ppc_rmmu_info (out)	4340	:Parameters: struct kvm_ppc_rmmu_info (out)
@@ -8095,7 +8095,7 @@ capability via KVM_ENABLE_CAP ioctl on the vcpu fd. Note that this · 3754 unmodified lines
8095	will disable the use of APIC hardware virtualization even if supported	8095	will disable the use of APIC hardware virtualization even if supported
8096	by the CPU, as it's incompatible with SynIC auto-EOI behavior.	8096	by the CPU, as it's incompatible with SynIC auto-EOI behavior.
8097		8097
8098	8.3 KVM_CAP_PPC_RADIX_MMU	8098	8.3 KVM_CAP_PPC_MMU_RADIX
8099	-------------------------	8099	-------------------------
8100		8100
8101	:Architectures: ppc	8101	:Architectures: ppc
@@ -8105,7 +8105,7 @@ available, means that the kernel can support guests using the · 3 unmodified lines
8105	radix MMU defined in Power ISA V3.00 (as implemented in the POWER9	8105	radix MMU defined in Power ISA V3.00 (as implemented in the POWER9
8106	processor).	8106	processor).
8107		8107
8108	8.4 KVM_CAP_PPC_HASH_MMU_V3	8108	8.4 KVM_CAP_PPC_MMU_HASH_V3
8109	---------------------------	8109	---------------------------
8110		8110
8111	:Architectures: ppc	8111	:Architectures: ppc

include/uapi/linux/kvm.h+2−2

@@ -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)

tools/include/uapi/linux/kvm.h+1−1

@@ -1502,7 +1502,7 @@ struct kvm_s390_ucas_mapping { · 1501 unmodified lines
1502	/* Available with KVM_CAP_SPAPR_RESIZE_HPT */	1502	/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
1503	#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)	1503	#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
1504	#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)	1504	#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
1505	/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */	1505	/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_MMU_HASH_V3 */
1506	#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)	1506	#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
1507	/* Available with KVM_CAP_PPC_RADIX_MMU */	1507	/* Available with KVM_CAP_PPC_RADIX_MMU */
1508	#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)	1508	#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)