Commit 0eee8f9d authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86: Use common loop iterator when handling CPUID 0xD.N

Use __do_cpuid_func()'s common loop iterator, "i", when enumerating the
sub-leafs for CPUID 0xD now that the CPUID 0xD loop doesn't need to
manual maintain separate counts for the entries index and CPUID index.

No functional changed 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 695538aa
...@@ -634,7 +634,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) ...@@ -634,7 +634,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
} }
break; break;
case 0xd: { case 0xd: {
int idx;
u64 supported = kvm_supported_xcr0(); u64 supported = kvm_supported_xcr0();
entry->eax &= supported; entry->eax &= supported;
...@@ -658,11 +657,11 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) ...@@ -658,11 +657,11 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
entry->ecx = 0; entry->ecx = 0;
entry->edx = 0; entry->edx = 0;
for (idx = 2; idx < 64; ++idx) { for (i = 2; i < 64; ++i) {
if (!(supported & BIT_ULL(idx))) if (!(supported & BIT_ULL(i)))
continue; continue;
entry = do_host_cpuid(array, function, idx); entry = do_host_cpuid(array, function, i);
if (!entry) if (!entry)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment