Commit aceac6e5 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Drop the explicit @index from do_cpuid_7_mask() 



Drop the index param from do_cpuid_7_mask() and instead switch on the
entry's index, which is guaranteed to be set by do_host_cpuid().

No functional change intended.

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 87849b1c

arch/x86/kvm/cpuid.c

+4 −4
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int __do_cpuid_func_emulated(struct kvm_cpuid_entry2 *entry, 
	return 0;

}



static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry, int index)

static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry)

{

	unsigned f_invpcid = kvm_x86_ops->invpcid_supported() ? F(INVPCID) : 0;

	unsigned f_mpx = kvm_mpx_supported() ? F(MPX) : 0;
@@ -380,7 +380,7 @@ static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry, int index) 
	const u32 kvm_cpuid_7_1_eax_x86_features =

		F(AVX512_BF16);



	switch (index) {

	switch (entry->index) {

	case 0:

		entry->eax = min(entry->eax, 1u);

		entry->ebx &= kvm_cpuid_7_0_ebx_x86_features;
@@ -573,7 +573,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, 
	case 7: {

		int i;



		do_cpuid_7_mask(entry, 0);

		do_cpuid_7_mask(entry);



		for (i = 1; i <= entry->eax; i++) {

			if (*nent >= maxnent)
@@ -582,7 +582,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, 
			do_host_cpuid(&entry[i], function, i);

			++*nent;



			do_cpuid_7_mask(&entry[i], i);

			do_cpuid_7_mask(&entry[i]);

		}

		break;

	}