KVM: x86: Refactor CPUID 0x4 and 0x8000001d handling

Refactoring the sub-leaf handling for CPUID 0x4/0x8000001d to eliminate
a one-off variable and its associated brackets.

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>

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 5044a595799f286aba6ffa7a4f6d3c722e077123..d75d539da759e0b151aef433157ff19461a83bb3 100644 (file)
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -545,20 +545,16 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
                break;
        /* functions 4 and 0x8000001d have additional index. */
        case 4:
-       case 0x8000001d: {
-               int cache_type;
-
-               /* read more entries until cache_type is zero */
-               for (i = 1; ; ++i) {
-                       cache_type = entry[i - 1].eax & 0x1f;
-                       if (!cache_type)
-                               break;
-
+       case 0x8000001d:
+               /*
+                * Read entries until the cache type in the previous entry is
+                * zero, i.e. indicates an invalid entry.
+                */
+               for (i = 1; entry[i - 1].eax & 0x1f; ++i) {
                        if (!do_host_cpuid(&entry[i], nent, maxnent, function, i))
                                goto out;
                }
                break;
-       }
        case 6: /* Thermal management */
                entry->eax = 0x4; /* allow ARAT */
                entry->ebx = 0;