[PATCH 5/5] virCapabilitiesHostNUMAInitReal: Bring variables into loop
Some variables are needed only inside for() loop. They were
declared at the beginning of the function because of VIR_FREE()
calls, but since they are auto-freed they can be declared inside
the loop.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/capabilities.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index c487229ae8..1dae6d38cc 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1596,22 +1596,22 @@ static int
virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
{
int n;
- unsigned long long memory;
virCapsHostNUMACellCPU *cpus = NULL;
- g_autoptr(virBitmap) cpumap = NULL;
- g_autofree virCapsHostNUMACellSiblingInfo *siblings = NULL;
- int nsiblings = 0;
- g_autofree virCapsHostNUMACellPageInfo *pageinfo = NULL;
- int npageinfo;
int ret = -1;
int ncpus = 0;
- int cpu;
int max_node;
if ((max_node = virNumaGetMaxNode()) < 0)
goto cleanup;
for (n = 0; n <= max_node; n++) {
+ g_autoptr(virBitmap) cpumap = NULL;
+ g_autofree virCapsHostNUMACellSiblingInfo *siblings = NULL;
+ int nsiblings = 0;
+ g_autofree virCapsHostNUMACellPageInfo *pageinfo = NULL;
+ int npageinfo;
+ unsigned long long memory;
+ int cpu;
size_t i;
if ((ncpus = virNumaGetNodeCPUs(n, &cpumap)) < 0) {
@@ -1645,8 +1645,6 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
ncpus, &cpus,
nsiblings, &siblings,
npageinfo, &pageinfo);
- virBitmapFree(cpumap);
- cpumap = NULL;
}
ret = 0;
--
2.26.3