Correct the author.
From: Chen Fan <chen.fan.f...@cn.fujitsu.com>
On 06/27/2014 06:03 PM, Gu Zheng wrote:
> Signed-off-by: Chen Fan <chen.fan.f...@cn.fujitsu.com>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> Signed-off-by: Gu Zheng <guz.f...@cn.fujitsu.com>
> ---
> target-i386/topology.h | 33 +++++++++++++++++----------------
> 1 files changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/target-i386/topology.h b/target-i386/topology.h
> index 07a6c5f..e9ff89c 100644
> --- a/target-i386/topology.h
> +++ b/target-i386/topology.h
> @@ -47,6 +47,12 @@
> */
> typedef uint32_t apic_id_t;
>
> +typedef struct X86CPUTopoInfo {
> + unsigned pkg_id;
> + unsigned core_id;
> + unsigned smt_id;
> +} X86CPUTopoInfo;
> +
> /* Return the bit width needed for 'count' IDs
> */
> static unsigned apicid_bitwidth_for_count(unsigned count)
> @@ -92,13 +98,11 @@ static inline unsigned apicid_pkg_offset(unsigned
> nr_cores, unsigned nr_threads)
> */
> static inline apic_id_t apicid_from_topo_ids(unsigned nr_cores,
> unsigned nr_threads,
> - unsigned pkg_id,
> - unsigned core_id,
> - unsigned smt_id)
> + const X86CPUTopoInfo *topo)
> {
> - return (pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) |
> - (core_id << apicid_core_offset(nr_cores, nr_threads)) |
> - smt_id;
> + return (topo->pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) |
> + (topo->core_id << apicid_core_offset(nr_cores, nr_threads)) |
> + topo->smt_id;
> }
>
> /* Calculate thread/core/package IDs for a specific topology,
> @@ -107,14 +111,12 @@ static inline apic_id_t apicid_from_topo_ids(unsigned
> nr_cores,
> static inline void x86_topo_ids_from_idx(unsigned nr_cores,
> unsigned nr_threads,
> unsigned cpu_index,
> - unsigned *pkg_id,
> - unsigned *core_id,
> - unsigned *smt_id)
> + X86CPUTopoInfo *topo)
> {
> unsigned core_index = cpu_index / nr_threads;
> - *smt_id = cpu_index % nr_threads;
> - *core_id = core_index % nr_cores;
> - *pkg_id = core_index / nr_cores;
> + topo->smt_id = cpu_index % nr_threads;
> + topo->core_id = core_index % nr_cores;
> + topo->pkg_id = core_index / nr_cores;
> }
>
> /* Make APIC ID for the CPU 'cpu_index'
> @@ -125,10 +127,9 @@ static inline apic_id_t x86_apicid_from_cpu_idx(unsigned
> nr_cores,
> unsigned nr_threads,
> unsigned cpu_index)
> {
> - unsigned pkg_id, core_id, smt_id;
> - x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index,
> - &pkg_id, &core_id, &smt_id);
> - return apicid_from_topo_ids(nr_cores, nr_threads, pkg_id, core_id,
> smt_id);
> + X86CPUTopoInfo topo;
> + x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, &topo);
> + return apicid_from_topo_ids(nr_cores, nr_threads, &topo);
> }
>
> #endif /* TARGET_I386_TOPOLOGY_H */
