Commit 8aba3842 authored by Igor Mammedov's avatar Igor Mammedov Committed by David Gibson
Browse files

change CPUArchId.cpu type to Object* 



so it could be reused for SPAPR cores as well

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 1ea69c0e

hw/acpi/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, 
    state->dev_count = id_list->len;

    state->devs = g_new0(typeof(*state->devs), state->dev_count);

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

        state->devs[i].cpu =  id_list->cpus[i].cpu;

        state->devs[i].cpu =  CPU(id_list->cpus[i].cpu);

        state->devs[i].arch_id = id_list->cpus[i].arch_id;

    }

    memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state,

hw/i386/pc.c

+4 −4
Original line number Diff line number Diff line
@@ -1830,7 +1830,7 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev, 
    }



    found_cpu = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);

    found_cpu->cpu = CPU(dev);

    found_cpu->cpu = OBJECT(dev);

out:

    error_propagate(errp, local_err);

}
@@ -2288,13 +2288,13 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) 
static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine)

{

    int i;

    CPUState *cpu;

    Object *cpu;

    HotpluggableCPUList *head = NULL;

    const char *cpu_type;



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

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

    cpu_type = object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(cpu)));

    cpu_type = object_get_typename(cpu);



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

        HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);
@@ -2308,7 +2308,7 @@ static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine) 
        cpu = machine->possible_cpus->cpus[i].cpu;

        if (cpu) {

            cpu_item->has_qom_path = true;

            cpu_item->qom_path = object_get_canonical_path(OBJECT(cpu));

            cpu_item->qom_path = object_get_canonical_path(cpu);

        }



        list_item->value = cpu_item;

include/hw/boards.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void machine_register_compat_props(MachineState *machine); 
typedef struct {

    uint64_t arch_id;

    CpuInstanceProperties props;

    struct CPUState *cpu;

    Object *cpu;

} CPUArchId;



/**