From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbmat-0001iW-Bo for qemu-devel@nongnu.org; Thu, 09 Feb 2017 06:08:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbmar-0004I9-0B for qemu-devel@nongnu.org; Thu, 09 Feb 2017 06:08:55 -0500 From: Igor Mammedov Date: Thu, 9 Feb 2017 12:08:36 +0100 Message-Id: <1486638518-171446-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1486638518-171446-1-git-send-email-imammedo@redhat.com> References: <1486638518-171446-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 5/7] change CPUArchId.cpu type to Object* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Gibson , Alexander Graf , qemu-ppc@nongnu.org, Bharata B Rao , ehabkost@redhat.com, drjones@redhat.com, Marcel Apfelbaum so it could be reused for SPAPR cores as well Signed-off-by: Igor Mammedov --- 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; -- 2.7.4