[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 5/7] change CPUArchId.cpu type to Object*
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH 5/7] change CPUArchId.cpu type to Object* |
Date: |
Thu, 9 Feb 2017 12:08:36 +0100 |
so it could be reused for SPAPR cores as well
Signed-off-by: Igor Mammedov <address@hidden>
---
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
- [Qemu-ppc] [PATCH 0/7] pc/spapr: unify handling of possible CPUs, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 2/7] pc: move pcms->possible_cpus init out of pc_cpus_init(), Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 1/7] machine: move possible_cpus to MachineState, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 3/7] pc: calculate topology only once when possible_cpus is initialised, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 4/7] pc: pass apic_id to pc_find_cpu_slot() directly so lookup could be done without CPU object, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 5/7] change CPUArchId.cpu type to Object*,
Igor Mammedov <=
- [Qemu-ppc] [PATCH 6/7] spapr: reuse machine->possible_cpus instead of cores[], Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 7/7] machine: unify [pc_|spapr_]query_hotpluggable_cpus() callbacks, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH v2 8/7] machine: replace query_hotpluggable_cpus() callback with has_hotpluggable_cpus flag, Igor Mammedov, 2017/02/10
- Re: [Qemu-ppc] [Qemu-devel] [PATCH 0/7] pc/spapr: unify handling of possible CPUs, Igor Mammedov, 2017/02/10