[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 8/8] Revert "spapr: Ensure CPU cores are added contigu
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH 8/8] Revert "spapr: Ensure CPU cores are added contiguously and removed in LIFO order" |
Date: |
Thu, 21 Jul 2016 17:54:39 +0200 |
From: David Gibson <address@hidden>
This reverts commit 5cbc64de25973e9129c5a7897734a06ac64b9aff.
We've now removed the limitations which made out-of-order cpu hotplug
cause problems.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_cpu_core.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index f68e88d..dc5deb7 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -126,23 +126,12 @@ static void spapr_core_release(DeviceState *dev, void
*opaque)
void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp)
{
- sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
CPUCore *cc = CPU_CORE(dev);
sPAPRDRConnector *drc =
spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, cc->core_id);
sPAPRDRConnectorClass *drck;
Error *local_err = NULL;
- int smt = kvmppc_smt_threads();
- int index = cc->core_id / smt;
- int spapr_max_cores = max_cpus / smp_threads;
- int i;
- for (i = spapr_max_cores - 1; i > index; i--) {
- if (spapr->cores[i]) {
- error_setg(errp, "core-id %d should be removed first", i * smt);
- return;
- }
- }
g_assert(drc);
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
@@ -225,7 +214,7 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev,
DeviceState *dev,
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(OBJECT(hotplug_dev));
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
int spapr_max_cores = max_cpus / smp_threads;
- int index, i;
+ int index;
int smt = kvmppc_smt_threads();
Error *local_err = NULL;
CPUCore *cc = CPU_CORE(dev);
@@ -263,14 +252,6 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev,
DeviceState *dev,
goto out;
}
- for (i = 0; i < index; i++) {
- if (!spapr->cores[i]) {
- error_setg(&local_err, "core-id %d should be added first",
- i * smt);
- goto out;
- }
- }
-
out:
g_free(base_core_type);
error_propagate(errp, local_err);
--
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, 2016/07/21
[Qemu-ppc] [PATCH 8/8] Revert "spapr: Ensure CPU cores are added contiguously and removed in LIFO order",
Igor Mammedov <=
Re: [Qemu-ppc] [PATCH 0/8] Fix migration issues with arbitrary cpu-hot(un)plug, Michael S. Tsirkin, 2016/07/21