[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 7/8] Revert "pc: Enforce adding CPUs contiguously and
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH 7/8] Revert "pc: Enforce adding CPUs contiguously and removing them in opposite order" |
Date: |
Thu, 21 Jul 2016 17:54:38 +0200 |
This reverts commit 4da7faaeb0c7dd3f7f233165d336c878f78fd1eb.
However since commit:
pc: init CPUState->cpu_index with index in possible_cpus[]
cpu_index is stable regardless of the order cpus were created
and QEMU instance stays migratable always so limitation added
by 4da7faaeb could be safely removed.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/pc.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 316fb43..d0e392a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1815,23 +1815,6 @@ static void pc_cpu_unplug_request_cb(HotplugHandler
*hotplug_dev,
goto out;
}
- if (idx < pcms->possible_cpus->len - 1 &&
- pcms->possible_cpus->cpus[idx + 1].cpu != NULL) {
- X86CPU *cpu;
-
- for (idx = pcms->possible_cpus->len - 1;
- pcms->possible_cpus->cpus[idx].cpu == NULL; idx--) {
- ;;
- }
-
- cpu = X86_CPU(pcms->possible_cpus->cpus[idx].cpu);
- error_setg(&local_err, "CPU [socket-id: %u, core-id: %u,"
- " thread-id: %u] should be removed first",
- cpu->socket_id, cpu->core_id, cpu->thread_id);
- goto out;
-
- }
-
hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
@@ -1929,23 +1912,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
return;
}
- if (idx != 0 && pcms->possible_cpus->cpus[idx - 1].cpu == NULL) {
- PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
-
- for (idx = 1; pcms->possible_cpus->cpus[idx].cpu != NULL; idx++) {
- ;;
- }
-
- x86_topo_ids_from_apicid(pcms->possible_cpus->cpus[idx].arch_id,
- smp_cores, smp_threads, &topo);
-
- if (!pcmc->legacy_cpu_hotplug) {
- error_setg(errp, "CPU [socket: %u, core: %u, thread: %u] should be"
- " added first", topo.pkg_id, topo.core_id, topo.smt_id);
- return;
- }
- }
-
/* if 'address' properties socket-id/core-id/thread-id are not set, set
them
* so that query_hotpluggable_cpus would show correct values
*/
--
2.7.4
[Qemu-ppc] [PATCH 4/8] qdev: fix object reference leak in case device.realize() fails, Igor Mammedov, 2016/07/21
[Qemu-ppc] [PATCH 7/8] Revert "pc: Enforce adding CPUs contiguously and removing them in opposite order",
Igor Mammedov <=
[Qemu-ppc] [PATCH 8/8] Revert "spapr: Ensure CPU cores are added contiguously and removed in LIFO order", Igor Mammedov, 2016/07/21
Re: [Qemu-ppc] [PATCH 0/8] Fix migration issues with arbitrary cpu-hot(un)plug, Michael S. Tsirkin, 2016/07/21