[PATCH v2 18/66] KVM: x86: Use common loop iterator when handling CPUID 0xD.N

Sean Christopherson
2020-03-03T00:02:20Z

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: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kvm/cpuid.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 4bf4f7d7741e..85f292088d91 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -634,7 +634,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
}
break;
case 0xd: {
- int idx;
u64 supported = kvm_supported_xcr0();

entry->eax &= supported;
@@ -658,11 +657,11 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
entry->ecx = 0;
entry->edx = 0;

- for (idx = 2; idx < 64; ++idx) {
- if (!(supported & BIT_ULL(idx)))
+ for (i = 2; i < 64; ++i) {
+ if (!(supported & BIT_ULL(i)))
continue;

- entry = do_host_cpuid(array, function, idx);
+ entry = do_host_cpuid(array, function, i);
if (!entry)
goto out;

--
2.24.1