[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 5/7] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu()
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 5/7] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu() |
Date: |
Thu, 14 Jan 2021 15:06:26 -0300 |
Use g_autoptr() with Object and g_autofree with the string to
avoid the need of a cleanup path.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_cpu_core.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 2f7dc3c23d..4f316a6f9d 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -277,8 +277,8 @@ 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;
+ g_autoptr(Object) obj = NULL;
+ g_autofree char *id = NULL;
CPUState *cs;
PowerPCCPU *cpu;
@@ -293,23 +293,17 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc,
int i, Error **errp)
cs->start_powered_off = true;
cs->cpu_index = cc->core_id + i;
if (!spapr_set_vcpu_id(cpu, cs->cpu_index, errp)) {
- goto err;
+ return NULL;
}
cpu->node_id = sc->node_id;
id = g_strdup_printf("thread[%d]", i);
object_property_add_child(OBJECT(sc), id, obj);
- g_free(id);
cpu->machine_data = g_new0(SpaprCpuState, 1);
- object_unref(obj);
return cpu;
-
-err:
- object_unref(obj);
- return NULL;
}
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
--
2.26.2
- [PATCH v1 0/7] pseries: avoid unplug the last online CPU core + assorted fixes, Daniel Henrique Barboza, 2021/01/14
- [PATCH v1 1/7] spapr.h: fix trailing whitespace in phb_placement, Daniel Henrique Barboza, 2021/01/14
- [PATCH v1 2/7] spapr_hcall.c: make do_client_architecture_support static, Daniel Henrique Barboza, 2021/01/14
- [PATCH v1 5/7] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu(),
Daniel Henrique Barboza <=
- [PATCH v1 3/7] spapr_rtas.c: fix identation in rtas_ibm_nmi_interlock() string, Daniel Henrique Barboza, 2021/01/14
- [PATCH v1 6/7] spapr.c: introduce spapr_core_unplug_possible(), Daniel Henrique Barboza, 2021/01/14
- [PATCH v1 7/7] spapr.c: consider CPU core online state before allowing unplug, Daniel Henrique Barboza, 2021/01/14