Commit 3c6712ec authored by Babu Moger's avatar Babu Moger Committed by Eduardo Habkost
Browse files

hw/i386: Rename apicid_from_topo_ids to x86_apicid_from_topo_ids 



For consistency rename apicid_from_topo_ids to x86_apicid_from_topo_ids.
No functional change.

Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-Id: <158396720748.58170.5335409429390890145.stgit@naples-babu.amd.com>
parent c24a41bb

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 
        topo_ids.die_id = cpu->die_id;

        topo_ids.core_id = cpu->core_id;

        topo_ids.smt_id = cpu->thread_id;

        cpu->apic_id = apicid_from_topo_ids(&topo_info, &topo_ids);

        cpu->apic_id = x86_apicid_from_topo_ids(&topo_info, &topo_ids);

    }



    cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);

include/hw/i386/topology.h

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static inline unsigned apicid_pkg_offset(X86CPUTopoInfo *topo_info) 
 *

 * The caller must make sure core_id < nr_cores and smt_id < nr_threads.

 */

static inline apic_id_t apicid_from_topo_ids(X86CPUTopoInfo *topo_info,

static inline apic_id_t x86_apicid_from_topo_ids(X86CPUTopoInfo *topo_info,

                                                 const X86CPUTopoIDs *topo_ids)

{

    return (topo_ids->pkg_id  << apicid_pkg_offset(topo_info)) |
@@ -165,7 +165,7 @@ static inline apic_id_t x86_apicid_from_cpu_idx(X86CPUTopoInfo *topo_info, 
{

    X86CPUTopoIDs topo_ids;

    x86_topo_ids_from_idx(topo_info, cpu_index, &topo_ids);

    return apicid_from_topo_ids(topo_info, &topo_ids);

    return x86_apicid_from_topo_ids(topo_info, &topo_ids);

}



#endif /* HW_I386_TOPOLOGY_H */