From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>,
qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au
Subject: [PATCH 12/14] spapr_pci_nvlink2.c: use g_autofree in spapr_phb_nvgpu_ram_populate_dt()
Date: Mon, 28 Feb 2022 14:50:02 -0300 [thread overview]
Message-ID: <20220228175004.8862-13-danielhb413@gmail.com> (raw)
In-Reply-To: <20220228175004.8862-1-danielhb413@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_pci_nvlink2.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
index 7fb0cf4d04..4678c79235 100644
--- a/hw/ppc/spapr_pci_nvlink2.c
+++ b/hw/ppc/spapr_pci_nvlink2.c
@@ -320,7 +320,7 @@ void spapr_phb_nvgpu_populate_dt(SpaprPhbState *sphb, void *fdt, int bus_off,
void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt)
{
int i, j, linkidx, npuoff;
- char *npuname;
+ g_autofree char *npuname = NULL;
if (!sphb->nvgpus) {
return;
@@ -333,11 +333,10 @@ void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt)
_FDT(fdt_setprop_cell(fdt, npuoff, "#size-cells", 0));
/* Advertise NPU as POWER9 so the guest can enable NPU2 contexts */
_FDT((fdt_setprop_string(fdt, npuoff, "compatible", "ibm,power9-npu")));
- g_free(npuname);
for (i = 0, linkidx = 0; i < sphb->nvgpus->num; ++i) {
for (j = 0; j < sphb->nvgpus->slots[i].linknum; ++j) {
- char *linkname = g_strdup_printf("link@%d", linkidx);
+ g_autofree char *linkname = g_strdup_printf("link@%d", linkidx);
int off = fdt_add_subnode(fdt, npuoff, linkname);
_FDT(off);
@@ -347,7 +346,6 @@ void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt)
_FDT((fdt_setprop_cell(fdt, off, "phandle",
PHANDLE_NVLINK(sphb, i, j))));
_FDT((fdt_setprop_cell(fdt, off, "ibm,npu-link-index", linkidx)));
- g_free(linkname);
++linkidx;
}
}
@@ -360,7 +358,8 @@ void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt)
&error_abort);
uint64_t size = object_property_get_uint(nv_mrobj, "size", NULL);
uint64_t mem_reg[2] = { cpu_to_be64(nvslot->gpa), cpu_to_be64(size) };
- char *mem_name = g_strdup_printf("memory@%"PRIx64, nvslot->gpa);
+ g_autofree char *mem_name = g_strdup_printf("memory@%"PRIx64,
+ nvslot->gpa);
int off = fdt_add_subnode(fdt, 0, mem_name);
_FDT(off);
@@ -378,7 +377,6 @@ void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt)
sizeof(mem_reg))));
_FDT((fdt_setprop_cell(fdt, off, "phandle",
PHANDLE_GPURAM(sphb, i))));
- g_free(mem_name);
}
}
--
2.35.1
next prev parent reply other threads:[~2022-02-28 17:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 17:49 [PATCH 00/14] simple cleanups in spapr files Daniel Henrique Barboza
2022-02-28 17:49 ` [PATCH 01/14] hw/ppc/spapr.c: use g_autofree in spapr_dt_chosen() Daniel Henrique Barboza
2022-03-01 0:58 ` David Gibson
2022-02-28 17:49 ` [PATCH 02/14] hw/ppc/spapr.c: fail early if no firmware found in machine_init() Daniel Henrique Barboza
2022-02-28 19:28 ` BALATON Zoltan
2022-03-01 2:24 ` David Gibson
2022-02-28 17:49 ` [PATCH 03/14] hw/ppc/spapr_caps.c: use g_autofree in spapr_cap_set_string() Daniel Henrique Barboza
2022-03-01 3:14 ` David Gibson
2022-02-28 17:49 ` [PATCH 04/14] hw/ppc/spapr_caps.c: use g_autofree in spapr_cap_get_string() Daniel Henrique Barboza
2022-03-01 3:15 ` David Gibson
2022-02-28 17:49 ` [PATCH 05/14] hw/ppc/spapr_caps.c: use g_autofree in spapr_caps_add_properties() Daniel Henrique Barboza
2022-03-01 3:15 ` David Gibson
2022-02-28 17:49 ` [PATCH 06/14] hw/ppc/spapr_drc.c: use g_auto in spapr_dt_drc() Daniel Henrique Barboza
2022-02-28 17:49 ` [PATCH 07/14] hw/ppc/spapr_drc.c: use g_autofree in drc_realize() Daniel Henrique Barboza
2022-02-28 17:49 ` [PATCH 08/14] hw/ppc/spapr_drc.c: use g_autofree in drc_unrealize() Daniel Henrique Barboza
2022-02-28 17:49 ` [PATCH 09/14] hw/ppc/spapr_drc.c: use g_autofree in spapr_dr_connector_new() Daniel Henrique Barboza
2022-02-28 17:50 ` [PATCH 10/14] hw/ppc/spapr_drc.c: use g_autofree in spapr_drc_by_index() Daniel Henrique Barboza
2022-02-28 17:50 ` [PATCH 11/14] hw/ppc/spapr_numa.c: simplify spapr_numa_write_assoc_lookup_arrays() Daniel Henrique Barboza
2022-02-28 17:50 ` Daniel Henrique Barboza [this message]
2022-02-28 17:50 ` [PATCH 13/14] hw/ppc/spapr_rtas.c: use g_autofree in rtas_ibm_get_system_parameter() Daniel Henrique Barboza
2022-02-28 17:50 ` [PATCH 14/14] hw/ppc/spapr_vio.c: use g_autofree in spapr_dt_vdevice() Daniel Henrique Barboza
2022-02-28 18:13 ` [PATCH 00/14] simple cleanups in spapr files Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220228175004.8862-13-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).