motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

spapr: Make spapr_cpu_core_unrealize() idempotent

Browse source 
spapr_cpu_core_realize() has a rollback path which partially duplicates
the code of spapr_cpu_core_unrealize().

Let's make spapr_cpu_core_unrealize() idempotent and call it instead. This
requires to:
- move the registration and unregistration of the reset handler around
  but it is harmless,
- allocate the array of vCPUs with g_new0() to be able to filter out
  unused slots,
- make sure to only unrealize vCPUs that have been already realized.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160279672626.1808373.14142129300586424514.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-10-15 23:18:46 +02:00 • committed by David Gibson
parent 96598cdb14
commit 9370c28f12
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

35
hw/ppc/spapr_cpu_core.c
View file

@ -227,15 +227,26 @@ static void spapr_cpu_core_unrealize(DeviceState *dev)
CPUCore *cc = CPU_CORE(dev); CPUCore *cc = CPU_CORE(dev);
int i; int i;
qemu_unregister_reset(spapr_cpu_core_reset_handler, sc);
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {
if (sc->threads[i]) {
/*
* Since this we can get here from the error path of
* spapr_cpu_core_realize(), make sure we only unrealize
* vCPUs that have already been realized.
*/
if (object_property_get_bool(OBJECT(sc->threads[i]), "realized",
&error_abort)) {
spapr_unrealize_vcpu(sc->threads[i], sc); spapr_unrealize_vcpu(sc->threads[i], sc);
} }
}
}
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {
if (sc->threads[i]) {
spapr_delete_vcpu(sc->threads[i]); spapr_delete_vcpu(sc->threads[i]);
} }
}
g_free(sc->threads); g_free(sc->threads);
qemu_unregister_reset(spapr_cpu_core_reset_handler, sc);
} }
static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr, static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
@ -322,32 +333,22 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
return; return;
} }
sc->threads = g_new(PowerPCCPU *, cc->nr_threads); qemu_register_reset(spapr_cpu_core_reset_handler, sc);
sc->threads = g_new0(PowerPCCPU *, cc->nr_threads);
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {
sc->threads[i] = spapr_create_vcpu(sc, i, errp); sc->threads[i] = spapr_create_vcpu(sc, i, errp);
if (!sc->threads[i]) { if (!sc->threads[i]) {
goto err; spapr_cpu_core_unrealize(dev);
return;
} }
} }
for (j = 0; j < cc->nr_threads; j++) { for (j = 0; j < cc->nr_threads; j++) {
if (!spapr_realize_vcpu(sc->threads[j], spapr, sc, errp)) { if (!spapr_realize_vcpu(sc->threads[j], spapr, sc, errp)) {
goto err_unrealize; spapr_cpu_core_unrealize(dev);
}
}
qemu_register_reset(spapr_cpu_core_reset_handler, sc);
return; return;
err_unrealize:
while (--j >= 0) {
spapr_unrealize_vcpu(sc->threads[j], sc);
} }
err:
while (--i >= 0) {
spapr_delete_vcpu(sc->threads[i]);
} }
g_free(sc->threads);
} }
static Property spapr_cpu_core_properties[] = { static Property spapr_cpu_core_properties[] = {