[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/18] pc: register created initial and hotpluged
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 10/18] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug() |
Date: |
Fri, 24 Jun 2016 18:05:58 +0200 |
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 <address@hidden>
---
hw/i386/pc.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 06c9de1..f5124d5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1142,7 +1142,6 @@ void pc_cpus_init(PCMachineState *pcms)
if (i < smp_cpus) {
cpu = pc_new_cpu(typename, x86_cpu_apic_id_from_index(i),
&error_fatal);
- pcms->possible_cpus->cpus[i].cpu = CPU(cpu);
object_unref(OBJECT(cpu));
}
}
@@ -1697,25 +1696,19 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
- if (!dev->hotplugged) {
- goto out;
- }
-
- if (!pcms->acpi_dev) {
- error_setg(&local_err,
- "cpu hotplug is not enabled: missing acpi device");
- goto out;
+ if (pcms->acpi_dev) {
+ hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
+ hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
+ if (local_err) {
+ goto out;
+ }
}
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
- if (local_err) {
- goto out;
+ if (dev->hotplugged) {
+ /* increment the number of CPUs */
+ rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1);
}
- /* increment the number of CPUs */
- 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->cpu = CPU(dev);
out:
--
1.8.3.1
- [Qemu-devel] [PATCH v2 02/18] pc: add x86_topo_ids_from_apicid(), (continued)
- [Qemu-devel] [PATCH v2 02/18] pc: add x86_topo_ids_from_apicid(), Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 03/18] pc: extract CPU lookup into a separate function, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 01/18] target-i386: cpu: use uint32_t for X86CPU.apic_id, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 06/18] target-i386: add socket/core/thread properties to X86CPU, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 04/18] pc: cpu: consolidate apic-id validity checks in pc_cpu_pre_plug(), Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 07/18] pc: set APIC ID based on socket/core/thread ids if it's not been set yet, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 05/18] target-i386: cpu: replace custom apic-id setter/getter with static property, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 09/18] pc: delay setting number of boot CPUs to machine_done time, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 11/18] pc: cpu: allow device_add to be used with x86 cpu, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 10/18] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(),
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 12/18] apic: move MAX_APICS check to 'apic' class, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 08/18] pc: implement query-hotpluggable-cpus callback, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 13/18] apic: drop APICCommonState.idx and use APIC ID as index in local_apics[], Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 14/18] (kvm)apic: add unrealize callbacks, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 15/18] target-i386: do not ignore error and fix apic parent, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 17/18] target-i386: add x86_cpu_unrealizefn(), Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 18/18] pc: make device_del CPU work for x86 CPUs, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 16/18] target-i386: fix apic object leak when CPU is deleted, Igor Mammedov, 2016/06/24