From 94490b59f18233253d6dba6d862d27996deb0dd1 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 7 Dec 2021 16:34:00 +0100 Subject: [PATCH] lxc_controller: Use automatic memory freeing for virBitmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/lxc/lxc_controller.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 7c593ee3a9..3e46a67296 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -731,7 +731,7 @@ static int virLXCControllerSetupLoopDevices(virLXCController *ctrl) static int virLXCControllerSetupCpuAffinity(virLXCController *ctrl) { int hostcpus, maxcpu = CPU_SETSIZE; - virBitmap *cpumap; + g_autoptr(virBitmap) cpumap = NULL; virBitmap *cpumapToSet; VIR_DEBUG("Setting CPU affinity"); @@ -761,11 +761,8 @@ static int virLXCControllerSetupCpuAffinity(virLXCController *ctrl) * so use '0' to indicate our own process ID. No threads are * running at this point */ - if (virProcessSetAffinity(0 /* Self */, cpumapToSet, false) < 0) { - virBitmapFree(cpumap); + if (virProcessSetAffinity(0 /* Self */, cpumapToSet, false) < 0) return -1; - } - virBitmapFree(cpumap); return 0; } @@ -810,7 +807,7 @@ static int virLXCControllerGetNumadAdvice(virLXCController *ctrl, */ static int virLXCControllerSetupResourceLimits(virLXCController *ctrl) { - virBitmap *auto_nodeset = NULL; + g_autoptr(virBitmap) auto_nodeset = NULL; int ret = -1; virBitmap *nodeset = NULL; virDomainNumatuneMemMode mode; @@ -841,7 +838,6 @@ static int virLXCControllerSetupResourceLimits(virLXCController *ctrl) ret = 0; cleanup: - virBitmapFree(auto_nodeset); return ret; } @@ -852,7 +848,7 @@ static int virLXCControllerSetupResourceLimits(virLXCController *ctrl) */ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl) { - virBitmap *auto_nodeset = NULL; + g_autoptr(virBitmap) auto_nodeset = NULL; int ret = -1; virBitmap *nodeset = NULL; size_t i; @@ -884,7 +880,6 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl) ret = 0; cleanup: - virBitmapFree(auto_nodeset); return ret; }