Commit bb5c8abe authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

KVM: x86: Insert "AMD" in KVM_X86_FEATURE_PSFD 



Intel and AMD have separate CPUID bits for each SPEC_CTRL bit. In the
case of every bit other than PFSD, the Intel CPUID bit has no vendor
name qualifier, but the AMD CPUID bit does. For consistency, rename
KVM_X86_FEATURE_PSFD to KVM_X86_FEATURE_AMD_PSFD.

No functional change intended.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Cc: Babu Moger <Babu.Moger@amd.com>
Message-Id: <20220830225210.2381310-1-jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3adbdf81

arch/x86/kvm/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ u32 xstate_required_size(u64 xstate_bv, bool compacted) 
 * This one is tied to SSB in the user API, and not

 * visible in /proc/cpuinfo.

 */

#define KVM_X86_FEATURE_PSFD		(13*32+28) /* Predictive Store Forwarding Disable */

#define KVM_X86_FEATURE_AMD_PSFD	(13*32+28) /* Predictive Store Forwarding Disable */



#define F feature_bit

#define SF(name) (boot_cpu_has(X86_FEATURE_##name) ? F(name) : 0)
@@ -694,7 +694,7 @@ void kvm_set_cpu_caps(void) 
		F(CLZERO) | F(XSAVEERPTR) |

		F(WBNOINVD) | F(AMD_IBPB) | F(AMD_IBRS) | F(AMD_SSBD) | F(VIRT_SSBD) |

		F(AMD_SSB_NO) | F(AMD_STIBP) | F(AMD_STIBP_ALWAYS_ON) |

		__feature_bit(KVM_X86_FEATURE_PSFD)

		__feature_bit(KVM_X86_FEATURE_AMD_PSFD)

	);



	/*