[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] pci: pci_add_option_rom(): refactor: use g_autofree for path
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 2/3] pci: pci_add_option_rom(): refactor: use g_autofree for path variable |
Date: |
Tue, 25 Apr 2023 13:56:02 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
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 4a61c8d24a..a442f8fce1 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2292,7 +2292,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;
@@ -2337,16 +2337,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) {
@@ -2354,7 +2351,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 {
@@ -2372,10 +2368,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
- [PATCH 0/3] ROM migration, Vladimir Sementsov-Ogievskiy, 2023/04/25
- [PATCH 3/3] pci: ROM preallocation for incoming migration, Vladimir Sementsov-Ogievskiy, 2023/04/25
- Re: [PATCH 3/3] pci: ROM preallocation for incoming migration, Michael S. Tsirkin, 2023/04/25
- Re: [PATCH 3/3] pci: ROM preallocation for incoming migration, Vladimir Sementsov-Ogievskiy, 2023/04/25
- Re: [PATCH 3/3] pci: ROM preallocation for incoming migration, Vladimir Sementsov-Ogievskiy, 2023/04/25
- Re: [PATCH 3/3] pci: ROM preallocation for incoming migration, Michael S. Tsirkin, 2023/04/25
- Re: [PATCH 3/3] pci: ROM preallocation for incoming migration, Igor Mammedov, 2023/04/25
- Re: [PATCH 3/3] pci: ROM preallocation for incoming migration, Vladimir Sementsov-Ogievskiy, 2023/04/25
[PATCH 2/3] pci: pci_add_option_rom(): refactor: use g_autofree for path variable,
Vladimir Sementsov-Ogievskiy <=
[PATCH 1/3] pci: pci_add_option_rom(): improve style, Vladimir Sementsov-Ogievskiy, 2023/04/25