External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virCapabilitiesInitCaches: Refactor freeing of temporary variables

Browse Source 
Move the 'path' and 'type' variables down to the appropriate block and
use automatic freeing for them as well as the temporary virBitmap.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-12-07 17:13:50 +01:00
parent 9ca80bfa11
commit 5b3f00d087
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conf/capabilities.c
View File

@ -2155,11 +2155,9 @@ int
virCapabilitiesInitCaches(virCaps *caps) virCapabilitiesInitCaches(virCaps *caps)
{ {
size_t i = 0; size_t i = 0;
virBitmap *cpus = NULL; g_autoptr(virBitmap) cpus = NULL;
ssize_t pos = -1; ssize_t pos = -1;
int ret = -1; int ret = -1;
char *path = NULL;
char *type = NULL;
struct dirent *ent = NULL; struct dirent *ent = NULL;
virCapsHostCacheBank *bank = NULL; virCapsHostCacheBank *bank = NULL;
const virResctrlMonitorType montype = VIR_RESCTRL_MONITOR_TYPE_CACHE; const virResctrlMonitorType montype = VIR_RESCTRL_MONITOR_TYPE_CACHE;
@ -2180,9 +2178,7 @@ virCapabilitiesInitCaches(virCaps *caps)
while ((pos = virBitmapNextSetBit(cpus, pos)) >= 0) { while ((pos = virBitmapNextSetBit(cpus, pos)) >= 0) {
int rv = -1; int rv = -1;
g_autoptr(DIR) dirp = NULL; g_autoptr(DIR) dirp = NULL;
g_autofree char *path = g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos);
VIR_FREE(path);
path = g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos);
rv = virDirOpenIfExists(&dirp, path); rv = virDirOpenIfExists(&dirp, path);
if (rv < 0) if (rv < 0)
@ -2192,6 +2188,7 @@ virCapabilitiesInitCaches(virCaps *caps)
continue; continue;
while ((rv = virDirRead(dirp, &ent, path)) > 0) { while ((rv = virDirRead(dirp, &ent, path)) > 0) {
g_autofree char *type = NULL;
int kernel_type; int kernel_type;
unsigned int level; unsigned int level;
@ -2242,7 +2239,6 @@ virCapabilitiesInitCaches(virCaps *caps)
} }
bank->type = kernel_type; bank->type = kernel_type;
VIR_FREE(type);
for (i = 0; i < caps->host.cache.nbanks; i++) { for (i = 0; i < caps->host.cache.nbanks; i++) {
if (virCapsHostCacheBankEquals(bank, caps->host.cache.banks[i])) if (virCapsHostCacheBankEquals(bank, caps->host.cache.banks[i]))
@ -2284,10 +2280,7 @@ virCapabilitiesInitCaches(virCaps *caps)
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(type);
VIR_FREE(path);
virCapsHostCacheBankFree(bank); virCapsHostCacheBankFree(bank);
virBitmapFree(cpus);
return ret; return ret;
} }