On Thu, Feb 09, 2017 at 12:08:36PM +0100, Igor Mammedov wrote: > so it could be reused for SPAPR cores as well > > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> include/hw/boards.h | 2 +-
> hw/acpi/cpu.c | 2 +-
> hw/i386/pc.c | 8 ++++----
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 4023b38..60209df 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -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;
>
> /**
> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
> index 6017ca0..8c719d3 100644
> --- a/hw/acpi/cpu.c
> +++ b/hw/acpi/cpu.c
> @@ -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,
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index ec6dded..afaae15 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1824,7 +1824,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);
> }
> @@ -2282,13 +2282,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);
> @@ -2302,7 +2302,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;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
