[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/18] pc: delay setting number of boot CPUs to m
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 09/18] pc: delay setting number of boot CPUs to machine_done time |
Date: |
Fri, 24 Jun 2016 18:05:57 +0200 |
currently present CPUs counter in CMOS only contains
smp_cpus (i.e. initial CPUs specified with -smp X) and
doesn't account for CPUs created with -device.
If VM is started with additional CPUs added with
-device, it will hang in BIOS waiting for condition
smp_cpus == counted_cpus
forever as counted_cpus will include -device CPUs as well
and be more than smp_cpus.
make present CPUs counter in CMOS to count all CPUs
(initial and coldplugged with -device) by delaying
it to machine done time when it possible to count
CPUs added with -device.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/pc.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b4902f4..06c9de1 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -471,9 +471,6 @@ void pc_cmos_init(PCMachineState *pcms,
rtc_set_memory(s, 0x5c, val >> 8);
rtc_set_memory(s, 0x5d, val >> 16);
- /* set the number of CPU */
- rtc_set_memory(s, 0x5f, smp_cpus - 1);
-
object_property_add_link(OBJECT(pcms), "rtc_state",
TYPE_ISA_DEVICE,
(Object **)&pcms->rtc,
@@ -1157,10 +1154,19 @@ void pc_cpus_init(PCMachineState *pcms)
static
void pc_machine_done(Notifier *notifier, void *data)
{
+ int i, boot_cpus = 0;
PCMachineState *pcms = container_of(notifier,
PCMachineState, machine_done);
PCIBus *bus = pcms->bus;
+ for (i = 0; i < pcms->possible_cpus->len; i++) {
+ if (pcms->possible_cpus->cpus[i].cpu) {
+ boot_cpus++;
+ }
+ }
+ /* set the number of CPUs */
+ rtc_set_memory(pcms->rtc, 0x5f, boot_cpus - 1);
+
if (bus) {
int extra_hosts = 0;
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/18] pc: add CPU hot-add/hot-remove with device_add/device_del, Igor Mammedov, 2016/06/24
- [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 <=
- [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, 2016/06/24
- [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