[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/7] hw/riscv/virt.c: use g_autofree in virt_machine_init()
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH 6/7] hw/riscv/virt.c: use g_autofree in virt_machine_init() |
Date: |
Mon, 22 Jan 2024 19:15:28 -0300 |
Move 'soc_name' to the loop, and give it g_autofree, to avoid the manual
g_free().
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
hw/riscv/virt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index f8278df83f..710fbbda2c 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1356,7 +1356,6 @@ static void virt_machine_init(MachineState *machine)
RISCVVirtState *s = RISCV_VIRT_MACHINE(machine);
MemoryRegion *system_memory = get_system_memory();
MemoryRegion *mask_rom = g_new(MemoryRegion, 1);
- char *soc_name;
DeviceState *mmio_irqchip, *virtio_irqchip, *pcie_irqchip;
int i, base_hartid, hart_count;
int socket_count = riscv_socket_count(machine);
@@ -1376,6 +1375,8 @@ static void virt_machine_init(MachineState *machine)
/* Initialize sockets */
mmio_irqchip = virtio_irqchip = pcie_irqchip = NULL;
for (i = 0; i < socket_count; i++) {
+ g_autofree char *soc_name = g_strdup_printf("soc%d", i);
+
if (!riscv_socket_check_hartids(machine, i)) {
error_report("discontinuous hartids in socket%d", i);
exit(1);
@@ -1393,10 +1394,8 @@ static void virt_machine_init(MachineState *machine)
exit(1);
}
- soc_name = g_strdup_printf("soc%d", i);
object_initialize_child(OBJECT(machine), soc_name, &s->soc[i],
TYPE_RISCV_HART_ARRAY);
- g_free(soc_name);
object_property_set_str(OBJECT(&s->soc[i]), "cpu-type",
machine->cpu_type, &error_abort);
object_property_set_int(OBJECT(&s->soc[i]), "hartid-base",
--
2.43.0
- [PATCH 0/7] hw/riscv: fix leak, add more g_autofree, Daniel Henrique Barboza, 2024/01/22
- [PATCH 1/7] hw/riscv/virt-acpi-build.c: fix leak in build_rhct(), Daniel Henrique Barboza, 2024/01/22
- [PATCH 2/7] hw/riscv/numa.c: use g_autofree in socket_fdt_write_distance_matrix(), Daniel Henrique Barboza, 2024/01/22
- [PATCH 3/7] hw/riscv/virt.c: use g_autofree in create_fdt_socket_cpus(), Daniel Henrique Barboza, 2024/01/22
- [PATCH 5/7] hw/riscv/virt.c: use g_autofree in create_fdt_virtio(), Daniel Henrique Barboza, 2024/01/22
- [PATCH 4/7] hw/riscv/virt.c: use g_autofree in create_fdt_sockets(), Daniel Henrique Barboza, 2024/01/22
- [PATCH 6/7] hw/riscv/virt.c: use g_autofree in virt_machine_init(),
Daniel Henrique Barboza <=
- [PATCH 7/7] hw/riscv/virt.c: use g_autofree in create_fdt_*, Daniel Henrique Barboza, 2024/01/22