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

possible_cpus: add CPUArchId::type field 



Remove dependency of possible_cpus on 1st CPU instance,
which decouples configuration data from CPU instances that
are created using that data.

Also later it would be used for enabling early cpu to numa node
configuration at runtime qmp_query_hotpluggable_cpus() should
provide a list of available cpu slots at early stage,
before machine_init() is called and the 1st cpu is created,
so that mgmt might be able to call it and use output to set
numa mapping.

Use MachineClass::possible_cpu_arch_ids() callback to set
cpu type info, along with the rest of possible cpu properties,
to let machine define which cpu type* will be used.

* for SPAPR it will be a spapr core type and for ARM/s390x/x86
  a respective descendant of CPUClass.

Move parse_numa_opts() in vl.c after cpu_model is parsed into
cpu_type so that possible_cpu_arch_ids() would know which
cpu_type to use during layout initialization.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Message-Id: <1515597770-268979-1-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent cb836434

hw/arm/virt.c

+2 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ static void machvirt_init(MachineState *machine) 
            break;

        }



        cpuobj = object_new(machine->cpu_type);

        cpuobj = object_new(possible_cpus->cpus[n].type);

        object_property_set_int(cpuobj, possible_cpus->cpus[n].arch_id,

                                "mp-affinity", NULL);
@@ -1575,6 +1575,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms) 
                                  sizeof(CPUArchId) * max_cpus);

    ms->possible_cpus->len = max_cpus;

    for (n = 0; n < ms->possible_cpus->len; n++) {

        ms->possible_cpus->cpus[n].type = ms->cpu_type;

        ms->possible_cpus->cpus[n].arch_id =

            virt_cpu_mp_affinity(vms, n);

        ms->possible_cpus->cpus[n].props.has_thread_id = true;

hw/core/machine.c

+6 −6
Original line number Diff line number Diff line
@@ -377,18 +377,18 @@ static void machine_init_notify(Notifier *notifier, void *data) 
HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine)

{

    int i;

    Object *cpu;

    HotpluggableCPUList *head = NULL;

    const char *cpu_type;

    MachineClass *mc = MACHINE_GET_CLASS(machine);



    /* force board to initialize possible_cpus if it hasn't been done yet */

    mc->possible_cpu_arch_ids(machine);



    cpu = machine->possible_cpus->cpus[0].cpu;

    assert(cpu); /* Boot cpu is always present */

    cpu_type = object_get_typename(cpu);

    for (i = 0; i < machine->possible_cpus->len; i++) {

        Object *cpu;

        HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);

        HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1);



        cpu_item->type = g_strdup(cpu_type);

        cpu_item->type = g_strdup(machine->possible_cpus->cpus[i].type);

        cpu_item->vcpus_count = machine->possible_cpus->cpus[i].vcpus_count;

        cpu_item->props = g_memdup(&machine->possible_cpus->cpus[i].props,

                                   sizeof(*cpu_item->props));

hw/i386/pc.c

+3 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,8 @@ void pc_cpus_init(PCMachineState *pcms) 
    pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1;

    possible_cpus = mc->possible_cpu_arch_ids(ms);

    for (i = 0; i < smp_cpus; i++) {

        pc_new_cpu(ms->cpu_type, possible_cpus->cpus[i].arch_id, &error_fatal);

        pc_new_cpu(possible_cpus->cpus[i].type, possible_cpus->cpus[i].arch_id,

                   &error_fatal);

    }

}
@@ -2307,6 +2308,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) 
    for (i = 0; i < ms->possible_cpus->len; i++) {

        X86CPUTopoInfo topo;



        ms->possible_cpus->cpus[i].type = ms->cpu_type;

        ms->possible_cpus->cpus[i].vcpus_count = 1;

        ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i);

        x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id,

hw/ppc/spapr.c

+8 −5
Original line number Diff line number Diff line
@@ -2226,11 +2226,6 @@ static void spapr_init_cpus(sPAPRMachineState *spapr) 
    int boot_cores_nr = smp_cpus / smp_threads;

    int i;



    if (!type) {

        error_report("Unable to find sPAPR CPU Core definition");

        exit(1);

    }



    possible_cpus = mc->possible_cpu_arch_ids(machine);

    if (mc->has_hotpluggable_cpus) {

        if (smp_cpus % smp_threads) {
@@ -3545,6 +3540,7 @@ static int64_t spapr_get_default_cpu_node_id(const MachineState *ms, int idx) 
static const CPUArchIdList *spapr_possible_cpu_arch_ids(MachineState *machine)

{

    int i;

    const char *core_type;

    int spapr_max_cores = max_cpus / smp_threads;

    MachineClass *mc = MACHINE_GET_CLASS(machine);
@@ -3556,12 +3552,19 @@ static const CPUArchIdList *spapr_possible_cpu_arch_ids(MachineState *machine) 
        return machine->possible_cpus;

    }



    core_type = spapr_get_cpu_core_type(machine->cpu_type);

    if (!core_type) {

        error_report("Unable to find sPAPR CPU Core definition");

        exit(1);

    }



    machine->possible_cpus = g_malloc0(sizeof(CPUArchIdList) +

                             sizeof(CPUArchId) * spapr_max_cores);

    machine->possible_cpus->len = spapr_max_cores;

    for (i = 0; i < machine->possible_cpus->len; i++) {

        int core_id = i * smp_threads;



        machine->possible_cpus->cpus[i].type = core_type;

        machine->possible_cpus->cpus[i].vcpus_count = smp_threads;

        machine->possible_cpus->cpus[i].arch_id = core_id;

        machine->possible_cpus->cpus[i].props.has_core_id = true;

hw/s390x/s390-virtio-ccw.c

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms) 
                                  sizeof(CPUArchId) * max_cpus);

    ms->possible_cpus->len = max_cpus;

    for (i = 0; i < ms->possible_cpus->len; i++) {

        ms->possible_cpus->cpus[i].type = ms->cpu_type;

        ms->possible_cpus->cpus[i].vcpus_count = 1;

        ms->possible_cpus->cpus[i].arch_id = i;

        ms->possible_cpus->cpus[i].props.has_core_id = true;