Re: [PATCH v5 10/16] hw/i386: Introduce apicid functions inside X86MachineState

[Igor Mammedov]

On Tue, 03 Mar 2020 13:57:56 -0600
Babu Moger <address@hidden> wrote:

> Introduce model specific apicid functions inside X86MachineState.
> These functions will be loaded from X86CPUDefinition.
> 
> Signed-off-by: Babu Moger <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>


> ---
>  hw/i386/x86.c         |    5 +++++
>  include/hw/i386/x86.h |    9 +++++++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 929b80c9c7..15b7815bb0 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -911,6 +911,11 @@ static void x86_machine_initfn(Object *obj)
>      x86ms->smm = ON_OFF_AUTO_AUTO;
>      x86ms->max_ram_below_4g = 0; /* use default */
>      x86ms->smp_dies = 1;
> +
> +    x86ms->apicid_from_cpu_idx = x86_apicid_from_cpu_idx;
> +    x86ms->topo_ids_from_apicid = x86_topo_ids_from_apicid;
> +    x86ms->apicid_from_topo_ids = x86_apicid_from_topo_ids;
> +    x86ms->apicid_pkg_offset = apicid_pkg_offset;
>  }
>  
>  static void x86_machine_class_init(ObjectClass *oc, void *data)
> diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
> index 22babcb3bb..2643b57629 100644
> --- a/include/hw/i386/x86.h
> +++ b/include/hw/i386/x86.h
> @@ -65,6 +65,15 @@ typedef struct {
>  
>      OnOffAuto smm;
>  
> +    /* Apic id specific handlers */
> +    uint32_t (*apicid_from_cpu_idx)(X86CPUTopoInfo *topo_info,
> +                                    unsigned cpu_index);
> +    void (*topo_ids_from_apicid)(apic_id_t apicid, X86CPUTopoInfo *topo_info,
> +                                 X86CPUTopoIDs *topo_ids);
> +    apic_id_t (*apicid_from_topo_ids)(X86CPUTopoInfo *topo_info,
> +                                      const X86CPUTopoIDs *topo_ids);
> +    uint32_t (*apicid_pkg_offset)(X86CPUTopoInfo *topo_info);
> +
>      /*
>       * Address space used by IOAPIC device. All IOAPIC interrupts
>       * will be translated to MSI messages in the address space.
> 
>