Commit 93b2a8cb authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

pc: add node-id property to CPU 



it will allow switching from cpu_index to property based
numa mapping in follow up patches.

PS:
patch changes default value of CPUState::numa_node from 0
to CPU_UNSET_NUMA_NODE_ID. The only place for x86 that
would affected is monitor's 'infor numa' command which
uses that field. However legacy 0 value is still preserved
by pc_cpu_pre_plug() in this patch if user/numa.c hasn't
set it explicitly, so there is no change in behavior.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1494415802-227633-4-git-send-email-imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 0b8497f0

hw/i386/pc.c

+17 −0
Original line number Diff line number Diff line
@@ -1893,6 +1893,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 
                            DeviceState *dev, Error **errp)

{

    int idx;

    int node_id;

    CPUState *cs;

    CPUArchId *cpu_slot;

    X86CPUTopoInfo topo;
@@ -1982,6 +1983,22 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 


    cs = CPU(cpu);

    cs->cpu_index = idx;



    node_id = numa_get_node_for_cpu(cs->cpu_index);

    if (node_id == nb_numa_nodes) {

        /* by default CPUState::numa_node was 0 if it's not set via CLI

         * keep it this way for now but in future we probably should

         * refuse to start up with incomplete numa mapping */

        node_id = 0;

    }

    if (cs->numa_node == CPU_UNSET_NUMA_NODE_ID) {

        cs->numa_node = node_id;

    } else if (cs->numa_node != node_id) {

            error_setg(errp, "node-id %d must match numa node specified"

                "with -numa option for cpu-index %d",

                cs->numa_node, cs->cpu_index);

            return;

    }

}



static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,

target/i386/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -3986,6 +3986,7 @@ static Property x86_cpu_properties[] = { 
    DEFINE_PROP_INT32("core-id", X86CPU, core_id, -1),

    DEFINE_PROP_INT32("socket-id", X86CPU, socket_id, -1),

#endif

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

    DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false),

    { .name  = "hv-spinlocks", .info  = &qdev_prop_spinlocks },

    DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false),