mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
machine: unify [pc_|spapr_]query_hotpluggable_cpus() callbacks
All callbacks FOO_query_hotpluggable_cpus() are practically the same except of setting vcpus_count to different values. Convert them to a generic machine_query_hotpluggable_cpus() callback by moving vcpus_count initialization to per machine specific callback possible_cpu_arch_ids(). Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
535455fdee
commit
f2d672c248
4 changed files with 38 additions and 66 deletions
|
@ -357,6 +357,37 @@ static void machine_init_notify(Notifier *notifier, void *data)
|
|||
foreach_dynamic_sysbus_device(error_on_sysbus_device, NULL);
|
||||
}
|
||||
|
||||
HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine)
|
||||
{
|
||||
int i;
|
||||
Object *cpu;
|
||||
HotpluggableCPUList *head = NULL;
|
||||
const char *cpu_type;
|
||||
|
||||
cpu = machine->possible_cpus->cpus[0].cpu;
|
||||
assert(cpu); /* Boot cpu is always present */
|
||||
cpu_type = object_get_typename(cpu);
|
||||
for (i = 0; i < machine->possible_cpus->len; i++) {
|
||||
HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);
|
||||
HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1);
|
||||
|
||||
cpu_item->type = g_strdup(cpu_type);
|
||||
cpu_item->vcpus_count = machine->possible_cpus->cpus[i].vcpus_count;
|
||||
cpu_item->props = g_memdup(&machine->possible_cpus->cpus[i].props,
|
||||
sizeof(*cpu_item->props));
|
||||
|
||||
cpu = machine->possible_cpus->cpus[i].cpu;
|
||||
if (cpu) {
|
||||
cpu_item->has_qom_path = true;
|
||||
cpu_item->qom_path = object_get_canonical_path(cpu);
|
||||
}
|
||||
list_item->value = cpu_item;
|
||||
list_item->next = head;
|
||||
head = list_item;
|
||||
}
|
||||
return head;
|
||||
}
|
||||
|
||||
static void machine_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue