Re: [Qemu-devel] [PATCH] cpu: introduce CpuTopoInfo structure for argument simplification

[Zhu Guihua <zhugh.fnst@cn.fujitsu.com>]

On 09/10/2015 12:11 AM, Eduardo Habkost wrote:
> On Mon, Sep 07, 2015 at 04:22:10PM +0200, Andreas Färber wrote:
>> Am 07.09.2015 um 13:29 schrieb Paolo Bonzini:
>>> On 21/08/2015 11:34, Zhu Guihua wrote:
>>>> @@ -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)
>>>>   {
>>> Isn't this function used in hw/i386/pc.c as well?
>> In case it gets respun now, in Seattle I had asked Eduardo to update the
>> subject with s/CpuTopoInfo/X86CPUTopoInfo/.
> I have fixed the subject line when applying to x86, and now added the
> following fix to the patch to avoid a respin:
>
>    diff --git a/hw/i386/pc.c b/hw/i386/pc.c
>    index 9f2924e..c515fca 100644
>    --- a/hw/i386/pc.c
>    +++ b/hw/i386/pc.c
>    @@ -1938,10 +1938,10 @@ static void pc_machine_initfn(Object *obj)
>     
>     static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index)
>     {
>    -    unsigned pkg_id, core_id, smt_id;
>    +    X86CPUTopoInfo topo;
>         x86_topo_ids_from_idx(smp_cores, smp_threads, cpu_index,
>    -                          &pkg_id, &core_id, &smt_id);
>    -    return pkg_id;
>    +                          &topo);
>    +    return topo.pkg_id;
>     }
>     
>     static void pc_machine_class_init(ObjectClass *oc, void *data)
>

I am sorry for my carelessness, thanks for your work.

Regards,
Zhu