Re: [PATCH v3 2/3] pci: pci_add_option_rom(): refactor: use g_autofree for path variable

[Juan Quintela]

Vladimir Sementsov-Ogievskiy  wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> Reviewed-by: David Hildenbrand 

Reviewed-by: Juan Quintela 

nice.

[PATCH v3 2/3] pci: pci_add_option_rom(): refactor: use g_autofree for path variable

[Vladimir Sementsov-Ogievskiy]

Signed-off-by: Vladimir Sementsov-Ogievskiy 
Reviewed-by: David Hildenbrand 
---
 hw/pci/pci.c | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index e26e2a7e65..3a0107758c 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2307,7 +2307,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool 
is_default_rom,
Error **errp)
 {
 int64_t size;
-char *path;
+g_autofree char *path = NULL;
 void *ptr;
 char name[32];
 const VMStateDescription *vmsd;
@@ -2349,16 +2349,13 @@ static void pci_add_option_rom(PCIDevice *pdev, bool 
is_default_rom,
 size = get_image_size(path);
 if (size < 0) {
 error_setg(errp, "failed to find romfile \"%s\"", pdev->romfile);
-g_free(path);
 return;
 } else if (size == 0) {
 error_setg(errp, "romfile \"%s\" is empty", pdev->romfile);
-g_free(path);
 return;
 } else if (size > 2 * GiB) {
 error_setg(errp, "romfile \"%s\" too large (size cannot exceed 2 GiB)",
pdev->romfile);
-g_free(path);
 return;
 }
 if (pdev->romsize != -1) {
@@ -2366,7 +2363,6 @@ static void pci_add_option_rom(PCIDevice *pdev, bool 
is_default_rom,
 error_setg(errp, "romfile \"%s\" (%u bytes) "
"is too large for ROM size %u",
pdev->romfile, (uint32_t)size, pdev->romsize);
-g_free(path);
 return;
 }
 } else {
@@ -2384,10 +2380,8 @@ static void pci_add_option_rom(PCIDevice *pdev, bool 
is_default_rom,
 ptr = memory_region_get_ram_ptr(&pdev->rom);
 if (load_image_size(path, ptr, size) < 0) {
 error_setg(errp, "failed to load romfile \"%s\"", pdev->romfile);
-g_free(path);
 return;
 }
-g_free(path);
 
 if (is_default_rom) {
 /* Only the default rom images will be patched (if needed). */
-- 
2.34.1