Commit 15f8b142 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

numa: move numa_node from CPUState into target specific classes 



Move vcpu's associated numa_node field out of generic CPUState
into inherited classes that actually care about cpu<->numa mapping,
i.e: ARMCPU, PowerPCCPU, X86CPU.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1496161442-96665-6-git-send-email-imammedo@redhat.com>
[ehabkost: s/CPU is belonging to/CPU belongs to/ on comments]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f75cd44d

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, CPUState *cs) 
                                cpu_to_be32(0x0),

                                cpu_to_be32(0x0),

                                cpu_to_be32(0x0),

                                cpu_to_be32(cs->numa_node),

                                cpu_to_be32(cpu->node_id),

                                cpu_to_be32(index)};



    /* Advertise NUMA via ibm,associativity */

hw/ppc/spapr_cpu_core.c

+3 −1
Original line number Diff line number Diff line
@@ -184,15 +184,17 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) 
    for (i = 0; i < cc->nr_threads; i++) {

        char id[32];

        CPUState *cs;

        PowerPCCPU *cpu;



        obj = sc->threads + i * size;



        object_initialize(obj, size, typename);

        cs = CPU(obj);

        cpu = POWERPC_CPU(cs);

        cs->cpu_index = cc->core_id + i;



        /* Set NUMA node for the threads belonged to core  */

        cs->numa_node = sc->node_id;

        cpu->node_id = sc->node_id;



        snprintf(id, sizeof(id), "thread[%d]", i);

        object_property_add_child(OBJECT(sc), id, obj, &local_err);

include/qom/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ struct qemu_work_item; 
 * @cpu_index: CPU index (informative).

 * @nr_cores: Number of cores within this CPU package.

 * @nr_threads: Number of threads within this CPU.

 * @numa_node: NUMA node this CPU is belonging to.

 * @host_tid: Host thread ID.

 * @running: #true if CPU is currently running (lockless).

 * @has_waiter: #true if a CPU is currently waiting for the cpu_exec_end;
@@ -314,7 +313,6 @@ struct CPUState { 


    int nr_cores;

    int nr_threads;

    int numa_node;



    struct QemuThread *thread;

#ifdef _WIN32

target/arm/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static Property arm_cpu_properties[] = { 
    DEFINE_PROP_UINT32("midr", ARMCPU, midr, 0),

    DEFINE_PROP_UINT64("mp-affinity", ARMCPU,

                        mp_affinity, ARM64_AFFINITY_INVALID),

    DEFINE_PROP_INT32("node-id", CPUState, numa_node, CPU_UNSET_NUMA_NODE_ID),

    DEFINE_PROP_INT32("node-id", ARMCPU, node_id, CPU_UNSET_NUMA_NODE_ID),

    DEFINE_PROP_END_OF_LIST()

};

target/arm/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -704,6 +704,8 @@ struct ARMCPU { 


    ARMELChangeHook *el_change_hook;

    void *el_change_hook_opaque;



    int32_t node_id; /* NUMA node this CPU belongs to */

};



static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)