| Message ID | 20210120232305.241521-2-danielhb413@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | spapr.c: add 'name' property for hotplugged CPUs nodes | expand |
On Wed, Jan 20, 2021 at 08:23:04PM -0300, Daniel Henrique Barboza wrote: > Next patch will use the 'nodename' string in spapr_core_dt_populate() > after the point it's being freed today. > > Instead of moving 'g_free(nodename)' around, let's do a QoL change in > both CPU DT functions where 'nodename' is being freed, and use > g_autofree to avoid the 'g_free()' call altogether. > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Applied, thanks. > --- > hw/ppc/spapr.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 6c47466fc2..cc1b709615 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -790,7 +790,6 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr) > CPUState *cs; > int n_cpus; > int cpus_offset; > - char *nodename; > int i; > > cpus_offset = fdt_add_subnode(fdt, 0, "cpus"); > @@ -818,6 +817,7 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr) > PowerPCCPU *cpu = POWERPC_CPU(cs); > int index = spapr_get_vcpu_id(cpu); > DeviceClass *dc = DEVICE_GET_CLASS(cs); > + g_autofree char *nodename = NULL; > int offset; > > if (!spapr_is_thread0_in_vcore(spapr, cpu)) { > @@ -826,7 +826,6 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr) > > nodename = g_strdup_printf("%s@%x", dc->fw_name, index); > offset = fdt_add_subnode(fdt, cpus_offset, nodename); > - g_free(nodename); > _FDT(offset); > spapr_dt_cpu(cs, fdt, offset, spapr); > } > @@ -3743,12 +3742,11 @@ int spapr_core_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr, > PowerPCCPU *cpu = POWERPC_CPU(cs); > DeviceClass *dc = DEVICE_GET_CLASS(cs); > int id = spapr_get_vcpu_id(cpu); > - char *nodename; > + g_autofree char *nodename = NULL; > int offset; > > nodename = g_strdup_printf("%s@%x", dc->fw_name, id); > offset = fdt_add_subnode(fdt, 0, nodename); > - g_free(nodename); > > spapr_dt_cpu(cs, fdt, offset, spapr); >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6c47466fc2..cc1b709615 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -790,7 +790,6 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr) CPUState *cs; int n_cpus; int cpus_offset; - char *nodename; int i; cpus_offset = fdt_add_subnode(fdt, 0, "cpus"); @@ -818,6 +817,7 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr) PowerPCCPU *cpu = POWERPC_CPU(cs); int index = spapr_get_vcpu_id(cpu); DeviceClass *dc = DEVICE_GET_CLASS(cs); + g_autofree char *nodename = NULL; int offset; if (!spapr_is_thread0_in_vcore(spapr, cpu)) { @@ -826,7 +826,6 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr) nodename = g_strdup_printf("%s@%x", dc->fw_name, index); offset = fdt_add_subnode(fdt, cpus_offset, nodename); - g_free(nodename); _FDT(offset); spapr_dt_cpu(cs, fdt, offset, spapr); } @@ -3743,12 +3742,11 @@ int spapr_core_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr, PowerPCCPU *cpu = POWERPC_CPU(cs); DeviceClass *dc = DEVICE_GET_CLASS(cs); int id = spapr_get_vcpu_id(cpu); - char *nodename; + g_autofree char *nodename = NULL; int offset; nodename = g_strdup_printf("%s@%x", dc->fw_name, id); offset = fdt_add_subnode(fdt, 0, nodename); - g_free(nodename); spapr_dt_cpu(cs, fdt, offset, spapr);
Next patch will use the 'nodename' string in spapr_core_dt_populate() after the point it's being freed today. Instead of moving 'g_free(nodename)' around, let's do a QoL change in both CPU DT functions where 'nodename' is being freed, and use g_autofree to avoid the 'g_free()' call altogether. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/ppc/spapr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)