leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2020-03-02 15:56:14 -08:00 committed by Paolo Bonzini
parent 87849b1ccb
commit aceac6e570
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kvm/cpuid.c
View File

@ -346,7 +346,7 @@ static int __do_cpuid_func_emulated(struct kvm_cpuid_entry2 *entry,
return 0; 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_invpcid = kvm_x86_ops->invpcid_supported() ? F(INVPCID) : 0;
unsigned f_mpx = kvm_mpx_supported() ? F(MPX) : 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 = const u32 kvm_cpuid_7_1_eax_x86_features =
F(AVX512_BF16); F(AVX512_BF16);
switch (index) { switch (entry->index) {
case 0: case 0:
entry->eax = min(entry->eax, 1u); entry->eax = min(entry->eax, 1u);
entry->ebx &= kvm_cpuid_7_0_ebx_x86_features; 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: { case 7: {
int i; int i;
do_cpuid_7_mask(entry, 0); do_cpuid_7_mask(entry);
for (i = 1; i <= entry->eax; i++) { for (i = 1; i <= entry->eax; i++) {
if (*nent >= maxnent) 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); do_host_cpuid(&entry[i], function, i);
++*nent; ++*nent;
do_cpuid_7_mask(&entry[i], i); do_cpuid_7_mask(&entry[i]);
} }
break; break;
} }