[PATCH v3 42/57] KVM: x86: Extract code for generating per-entry emulated CPUID information

[Sean Christopherson]

Extract the meat of __do_cpuid_func_emulated() into a separate helper,
cpuid_func_emulated(), so that cpuid_func_emulated() can be used with a
single CPUID entry.  This will allow marking emulated features as fully
supported in the guest cpu_caps without needing to hardcode the set of
emulated features in multiple locations.

No functional change intended.

Reviewed-by: Maxim Levitsky <mlevi...@redhat.com>
Signed-off-by: Sean Christopherson <sea...@google.com>
---
 arch/x86/kvm/cpuid.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 803d89577e6f..153c4378b987 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -1192,14 +1192,10 @@ static struct kvm_cpuid_entry2 *do_host_cpuid(struct 
kvm_cpuid_array *array,
        return entry;
 }
 
-static int __do_cpuid_func_emulated(struct kvm_cpuid_array *array, u32 func)
+static int cpuid_func_emulated(struct kvm_cpuid_entry2 *entry, u32 func)
 {
-       struct kvm_cpuid_entry2 *entry;
+       memset(entry, 0, sizeof(*entry));
 
-       if (array->nent >= array->maxnent)
-               return -E2BIG;
-
-       entry = &array->entries[array->nent];
        entry->function = func;
        entry->index = 0;
        entry->flags = 0;
@@ -1207,23 +1203,27 @@ static int __do_cpuid_func_emulated(struct 
kvm_cpuid_array *array, u32 func)
        switch (func) {
        case 0:
                entry->eax = 7;
-               ++array->nent;
-               break;
+               return 1;
        case 1:
                entry->ecx = feature_bit(MOVBE);
-               ++array->nent;
-               break;
+               return 1;
        case 7:
                entry->flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
                entry->eax = 0;
                if (kvm_cpu_cap_has(X86_FEATURE_RDTSCP))
                        entry->ecx = feature_bit(RDPID);
-               ++array->nent;
-               break;
+               return 1;
        default:
-               break;
+               return 0;
        }
+}
 
+static int __do_cpuid_func_emulated(struct kvm_cpuid_array *array, u32 func)
+{
+       if (array->nent >= array->maxnent)
+               return -E2BIG;
+
+       array->nent += cpuid_func_emulated(&array->entries[array->nent], func);
        return 0;
 }
 
-- 
2.47.0.338.g60cca15819-goog