david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc: Register created initial and hotpluged CPUs in one place pc_cpu_plug()

Browse Source 
Consolidate possible_cpus array management in pc_cpu_plug() for
smp_cpus, coldplugged with -device and hotplugged with
device_add.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2016-07-14 18:54:32 +02:00 committed by Eduardo Habkost
parent ba157b696c
commit a44a49dbf2
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/i386/pc.c
View File

@ -1204,7 +1204,6 @@ void pc_cpus_init(PCMachineState *pcms)
if (i < smp_cpus) { if (i < smp_cpus) {
cpu = pc_new_cpu(typename, x86_cpu_apic_id_from_index(i), cpu = pc_new_cpu(typename, x86_cpu_apic_id_from_index(i),
&error_fatal); &error_fatal);
pcms->possible_cpus->cpus[i].cpu = CPU(cpu);
object_unref(OBJECT(cpu)); object_unref(OBJECT(cpu));
} }
} }
@ -1783,24 +1782,18 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
Error *local_err = NULL; Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev); PCMachineState *pcms = PC_MACHINE(hotplug_dev);
if (!dev->hotplugged) { if (pcms->acpi_dev) {
goto out;
}
if (!pcms->acpi_dev) {
error_setg(&local_err,
"cpu hotplug is not enabled: missing acpi device");
goto out;
}
hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
if (local_err) { if (local_err) {
goto out; goto out;
} }
}
if (dev->hotplugged) {
/* increment the number of CPUs */ /* increment the number of CPUs */
rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1); rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1);
}
found_cpu = pc_find_cpu_slot(pcms, CPU(dev), NULL); found_cpu = pc_find_cpu_slot(pcms, CPU(dev), NULL);
found_cpu->cpu = CPU(dev); found_cpu->cpu = CPU(dev);