ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change CPUArchId.cpu type to Object* 

so it could be reused for SPAPR cores as well

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2017-02-09 12:08:36 +01:00 committed by David Gibson
parent 1ea69c0e25
commit 8aba384298
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/acpi/cpu.c
View File

@ -198,7 +198,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
state->dev_count = id_list->len; state->dev_count = id_list->len;
state->devs = g_new0(typeof(*state->devs), state->dev_count); state->devs = g_new0(typeof(*state->devs), state->dev_count);
for (i = 0; i < id_list->len; i++) { 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; state->devs[i].arch_id = id_list->cpus[i].arch_id;
} }
memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state, memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state,

8
hw/i386/pc.c
View File

@ -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 = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);
found_cpu->cpu = CPU(dev); found_cpu->cpu = OBJECT(dev);
out: out:
error_propagate(errp, local_err); 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) static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine)
{ {
int i; int i;
CPUState *cpu; Object *cpu;
HotpluggableCPUList *head = NULL; HotpluggableCPUList *head = NULL;
const char *cpu_type; const char *cpu_type;
cpu = machine->possible_cpus->cpus[0].cpu; cpu = machine->possible_cpus->cpus[0].cpu;
assert(cpu); /* BSP is always present */ 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++) { for (i = 0; i < machine->possible_cpus->len; i++) {
HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1); 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; cpu = machine->possible_cpus->cpus[i].cpu;
if (cpu) { if (cpu) {
cpu_item->has_qom_path = true; 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; list_item->value = cpu_item;

2
include/hw/boards.h
View File

@ -51,7 +51,7 @@ void machine_register_compat_props(MachineState *machine);
typedef struct { typedef struct {
uint64_t arch_id; uint64_t arch_id;
CpuInstanceProperties props; CpuInstanceProperties props;
struct CPUState *cpu; Object *cpu;
} CPUArchId; } CPUArchId;
/** /**