[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v6 3/6] loader: extract rom_free() function
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-arm] [PATCH v6 3/6] loader: extract rom_free() function |
Date: |
Tue, 14 Aug 2018 17:27:36 +0100 |
The next patch will need to free a rom. There is already code to do
this in rom_add_file().
Note that rom_add_file() uses:
rom = g_malloc0(sizeof(*rom));
...
if (rom->fw_dir) {
g_free(rom->fw_dir);
g_free(rom->fw_file);
}
The conditional is unnecessary since g_free(NULL) is a no-op.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/core/loader.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index bbb6e65bb5..0c72e7c05a 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -847,6 +847,17 @@ struct Rom {
static FWCfgState *fw_cfg;
static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms);
+/* rom->data must be heap-allocated (do not use with rom_add_elf_program()) */
+static void rom_free(Rom *rom)
+{
+ g_free(rom->data);
+ g_free(rom->path);
+ g_free(rom->name);
+ g_free(rom->fw_dir);
+ g_free(rom->fw_file);
+ g_free(rom);
+}
+
static inline bool rom_order_compare(Rom *rom, Rom *item)
{
return ((uintptr_t)(void *)rom->as > (uintptr_t)(void *)item->as) ||
@@ -995,15 +1006,7 @@ err:
if (fd != -1)
close(fd);
- g_free(rom->data);
- g_free(rom->path);
- g_free(rom->name);
- if (fw_dir) {
- g_free(rom->fw_dir);
- g_free(rom->fw_file);
- }
- g_free(rom);
-
+ rom_free(rom);
return -1;
}
--
2.17.1
- [Qemu-arm] [PATCH v6 0/6] arm: add Cortex M0 CPU model and hex file loader, Stefan Hajnoczi, 2018/08/14
- [Qemu-arm] [PATCH v6 1/6] hw/arm: make bitbanded IO optional on ARMv7-M, Stefan Hajnoczi, 2018/08/14
- [Qemu-arm] [PATCH v6 3/6] loader: extract rom_free() function,
Stefan Hajnoczi <=
- [Qemu-arm] [PATCH v6 2/6] target/arm: add "cortex-m0" CPU model, Stefan Hajnoczi, 2018/08/14
- [Qemu-arm] [PATCH v6 5/6] loader: Implement .hex file loader, Stefan Hajnoczi, 2018/08/14
- [Qemu-arm] [PATCH v6 6/6] Add QTest testcase for the Intel Hexadecimal, Stefan Hajnoczi, 2018/08/14
- [Qemu-arm] [PATCH v6 4/6] loader: add rom transaction API, Stefan Hajnoczi, 2018/08/14
- Re: [Qemu-arm] [PATCH v6 0/6] arm: add Cortex M0 CPU model and hex file loader, Peter Maydell, 2018/08/16