spapr_cpu_core.c: use g_auto* in spapr_create_vcpu()
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>
This commit is contained in:
parent
7058904738
commit
2a05350e90
@ -277,8 +277,8 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc, int i, Error **errp)
|
|||||||
{
|
{
|
||||||
SpaprCpuCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(sc);
|
SpaprCpuCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(sc);
|
||||||
CPUCore *cc = CPU_CORE(sc);
|
CPUCore *cc = CPU_CORE(sc);
|
||||||
Object *obj;
|
g_autoptr(Object) obj = NULL;
|
||||||
char *id;
|
g_autofree char *id = NULL;
|
||||||
CPUState *cs;
|
CPUState *cs;
|
||||||
PowerPCCPU *cpu;
|
PowerPCCPU *cpu;
|
||||||
|
|
||||||
@ -293,23 +293,17 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc, int i, Error **errp)
|
|||||||
cs->start_powered_off = true;
|
cs->start_powered_off = true;
|
||||||
cs->cpu_index = cc->core_id + i;
|
cs->cpu_index = cc->core_id + i;
|
||||||
if (!spapr_set_vcpu_id(cpu, cs->cpu_index, errp)) {
|
if (!spapr_set_vcpu_id(cpu, cs->cpu_index, errp)) {
|
||||||
goto err;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
cpu->node_id = sc->node_id;
|
cpu->node_id = sc->node_id;
|
||||||
|
|
||||||
id = g_strdup_printf("thread[%d]", i);
|
id = g_strdup_printf("thread[%d]", i);
|
||||||
object_property_add_child(OBJECT(sc), id, obj);
|
object_property_add_child(OBJECT(sc), id, obj);
|
||||||
g_free(id);
|
|
||||||
|
|
||||||
cpu->machine_data = g_new0(SpaprCpuState, 1);
|
cpu->machine_data = g_new0(SpaprCpuState, 1);
|
||||||
|
|
||||||
object_unref(obj);
|
|
||||||
return cpu;
|
return cpu;
|
||||||
|
|
||||||
err:
|
|
||||||
object_unref(obj);
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user