[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] x86/cpu: Fold generic_identify() into its single caller



commit 670ef9e7192d0413feefbabeea757e0275549d4c
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Jan 23 17:32:58 2026 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Sat Apr 4 12:20:11 2026 +0200

    x86/cpu: Fold generic_identify() into its single caller
    
    This makes the correctness of future changes more obvious.
    
    No functional change.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/cpu/common.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index dd88694a72..fe8a818c1b 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -446,10 +446,13 @@ void reset_cpuinfo(struct cpuinfo_x86 *c, bool keep_basic)
     CPU_DATA_INIT((*c));
 }
 
-static void generic_identify(struct cpuinfo_x86 *c)
+void identify_cpu(struct cpuinfo_x86 *c)
 {
        uint64_t val;
        u32 eax, ebx, ecx, edx, tmp;
+       unsigned int i;
+
+       reset_cpuinfo(c, false);
 
        /* Get vendor name */
        cpuid(0, &c->cpuid_level, &ebx, &ecx, &edx);
@@ -549,17 +552,6 @@ static void generic_identify(struct cpuinfo_x86 *c)
                c->x86_capability[FEATURESET_m10Al] = val;
                c->x86_capability[FEATURESET_m10Ah] = val >> 32;
        }
-}
-
-/*
- * This does the hard work of actually picking apart the CPU stuff...
- */
-void identify_cpu(struct cpuinfo_x86 *c)
-{
-       int i;
-
-       reset_cpuinfo(c, false);
-       generic_identify(c);
 
        /*
         * Vendor-specific initialization.  In this section we
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.