[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 25/28] spapr_cpu_core: introduce spapr_create_vcpu()
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 25/28] spapr_cpu_core: introduce spapr_create_vcpu() |
Date: |
Mon, 18 Jun 2018 13:53:21 +1000 |
From: Greg Kurz <address@hidden>
This moves some code out from spapr_cpu_core_realize() for clarity. No
functional change.
Signed-off-by: Greg Kurz <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_cpu_core.c | 73 +++++++++++++++++++++++++----------------
1 file changed, 45 insertions(+), 28 deletions(-)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 30a7cf9e03..98a018c8d0 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -157,6 +157,49 @@ error:
error_propagate(errp, local_err);
}
+static PowerPCCPU *spapr_create_vcpu(sPAPRCPUCore *sc, int i, Error **errp)
+{
+ sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(sc);
+ CPUCore *cc = CPU_CORE(sc);
+ Object *obj;
+ char *id;
+ CPUState *cs;
+ PowerPCCPU *cpu;
+ Error *local_err = NULL;
+
+ obj = object_new(scc->cpu_type);
+
+ cs = CPU(obj);
+ cpu = POWERPC_CPU(obj);
+ cs->cpu_index = cc->core_id + i;
+ spapr_set_vcpu_id(cpu, cs->cpu_index, &local_err);
+ if (local_err) {
+ goto err;
+ }
+
+ cpu->node_id = sc->node_id;
+
+ id = g_strdup_printf("thread[%d]", i);
+ object_property_add_child(OBJECT(sc), id, obj, &local_err);
+ g_free(id);
+ if (local_err) {
+ goto err;
+ }
+
+ object_unref(obj);
+ return cpu;
+
+err:
+ object_unref(obj);
+ error_propagate(errp, local_err);
+ return NULL;
+}
+
+static void spapr_delete_vcpu(PowerPCCPU *cpu)
+{
+ object_unparent(OBJECT(cpu));
+}
+
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
{
/* We don't use SPAPR_MACHINE() in order to exit gracefully if the user
@@ -166,10 +209,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error
**errp)
(sPAPRMachineState *) object_dynamic_cast(qdev_get_machine(),
TYPE_SPAPR_MACHINE);
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
- sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
CPUCore *cc = CPU_CORE(OBJECT(dev));
Error *local_err = NULL;
- Object *obj;
int i, j;
if (!spapr) {
@@ -179,33 +220,10 @@ static void spapr_cpu_core_realize(DeviceState *dev,
Error **errp)
sc->threads = g_new(PowerPCCPU *, cc->nr_threads);
for (i = 0; i < cc->nr_threads; i++) {
- char *id;
- CPUState *cs;
- PowerPCCPU *cpu;
-
- obj = object_new(scc->cpu_type);
-
- cs = CPU(obj);
- cpu = sc->threads[i] = POWERPC_CPU(obj);
- cs->cpu_index = cc->core_id + i;
- spapr_set_vcpu_id(cpu, cs->cpu_index, &local_err);
- if (local_err) {
- object_unref(obj);
- goto err;
- }
-
-
- /* Set NUMA node for the threads belonged to core */
- cpu->node_id = sc->node_id;
-
- id = g_strdup_printf("thread[%d]", i);
- object_property_add_child(OBJECT(sc), id, obj, &local_err);
- g_free(id);
+ sc->threads[i] = spapr_create_vcpu(sc, i, &local_err);
if (local_err) {
- object_unref(obj);
goto err;
}
- object_unref(obj);
}
for (j = 0; j < cc->nr_threads; j++) {
@@ -222,8 +240,7 @@ err_unrealize:
}
err:
while (--i >= 0) {
- obj = OBJECT(sc->threads[i]);
- object_unparent(obj);
+ spapr_delete_vcpu(sc->threads[i]);
}
g_free(sc->threads);
error_propagate(errp, local_err);
--
2.17.1
- [Qemu-ppc] [PULL 22/28] spapr_cpu_core: convert last snprintf() to g_strdup_printf(), (continued)
- [Qemu-ppc] [PULL 22/28] spapr_cpu_core: convert last snprintf() to g_strdup_printf(), David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 27/28] target/ppc, spapr: Move VPA information to machine_data, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 06/28] mac_newworld: add via machine option to control mac99 VIA/ADB configuration, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 24/28] spapr_cpu_core: add missing rollback on realization path, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 12/28] xics_kvm: fix a build break, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 23/28] spapr_cpu_core: fix potential leak in spapr_cpu_core_realize(), David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 21/28] pnv: Add cpu unrealize path, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 17/28] spapr: Clean up cpu realize/unrealize paths, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 07/28] mac_newworld: add gpios to macio devices with PMU enabled, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 28/28] spapr: fix xics_system_init() error path, David Gibson, 2018/06/17
- [Qemu-ppc] [PULL 25/28] spapr_cpu_core: introduce spapr_create_vcpu(),
David Gibson <=
- [Qemu-ppc] [PULL 11/28] mac_newworld: add PMU device, David Gibson, 2018/06/17
- Re: [Qemu-ppc] [PULL 00/28] ppc-for-3.0 queue 20180618, Peter Maydell, 2018/06/19