[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/13] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu()
From: |
David Gibson |
Subject: |
[PULL 13/13] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu() |
Date: |
Tue, 19 Jan 2021 17:23:18 +1100 |
From: Daniel Henrique Barboza <danielhb413@gmail.com>
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>
Message-Id: <20210114180628.1675603-6-danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
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.29.2
- [PULL 00/13] ppc-for-6.0 queue 20210119, David Gibson, 2021/01/19
- [PULL 03/13] hw/intc/ppc-uic: Make default dcr-base 0xc0, not 0x30, David Gibson, 2021/01/19
- [PULL 04/13] hw/ppc/ppc405_uc: Drop use of ppcuic_init(), David Gibson, 2021/01/19
- [PULL 01/13] hw/ppc/sam460ex: Drop use of ppcuic_init(), David Gibson, 2021/01/19
- [PULL 02/13] hw/ppc: Delete unused ppc405cr_init() code, David Gibson, 2021/01/19
- [PULL 12/13] spapr_rtas.c: fix identation of rtas_ibm_suspend_me() args, David Gibson, 2021/01/19
- [PULL 08/13] sam460ex: Use type cast macro instead of simple cast, David Gibson, 2021/01/19
- [PULL 10/13] spapr.h: fix trailing whitespace in phb_placement, David Gibson, 2021/01/19
- [PULL 11/13] spapr_hcall.c: make do_client_architecture_support static, David Gibson, 2021/01/19
- [PULL 05/13] hw/ppc: Remove unused ppcuic_init(), David Gibson, 2021/01/19
- [PULL 13/13] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu(),
David Gibson <=
- [PULL 07/13] Revert "ppc4xx: Move common dependency on serial to common option", David Gibson, 2021/01/19
- [PULL 09/13] spapr: Improve handling of memory unplug with old guests, David Gibson, 2021/01/19
- [PULL 06/13] Revert "sam460ex: Remove FDT_PPC dependency from KConfig", David Gibson, 2021/01/19
- Re: [PULL 00/13] ppc-for-6.0 queue 20210119, Peter Maydell, 2021/01/19