NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

test_driver: Use automatic memory freeing for temporary virBitmaps

Browse Source 
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 16:08:07 +01:00
parent f33c86be1d
commit 17159773ee
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/test_driver.c
View File

@ -2826,7 +2826,7 @@ testDomainPinEmulator(virDomainPtr dom,
{ {
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
virDomainDef *def = NULL; virDomainDef *def = NULL;
virBitmap *pcpumap = NULL; g_autoptr(virBitmap) pcpumap = NULL;
int ret = -1; int ret = -1;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@ -2848,11 +2848,10 @@ testDomainPinEmulator(virDomainPtr dom,
} }
virBitmapFree(def->cputune.emulatorpin); virBitmapFree(def->cputune.emulatorpin);
def->cputune.emulatorpin = virBitmapNewCopy(pcpumap); def->cputune.emulatorpin = g_steal_pointer(&pcpumap);
ret = 0; ret = 0;
cleanup: cleanup:
virBitmapFree(pcpumap);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -2868,7 +2867,7 @@ testDomainGetEmulatorPinInfo(virDomainPtr dom,
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
virDomainDef *def = NULL; virDomainDef *def = NULL;
virBitmap *cpumask = NULL; virBitmap *cpumask = NULL;
virBitmap *bitmap = NULL; g_autoptr(virBitmap) bitmap = NULL;
int hostcpus; int hostcpus;
int ret = -1; int ret = -1;
@ -2898,7 +2897,6 @@ testDomainGetEmulatorPinInfo(virDomainPtr dom,
ret = 1; ret = 1;
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virBitmapFree(bitmap);
return ret; return ret;
} }
@ -3049,7 +3047,7 @@ static int testDomainGetVcpus(virDomainPtr domain,
int hostcpus; int hostcpus;
int ret = -1; int ret = -1;
unsigned long long statbase; unsigned long long statbase;
virBitmap *allcpumap = NULL; g_autoptr(virBitmap) allcpumap = NULL;
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
return -1; return -1;
@ -3102,7 +3100,6 @@ static int testDomainGetVcpus(virDomainPtr domain,
ret = maxinfo; ret = maxinfo;
cleanup: cleanup:
virBitmapFree(allcpumap);
virDomainObjEndAPI(&privdom); virDomainObjEndAPI(&privdom);
return ret; return ret;
} }
@ -3523,7 +3520,7 @@ testDomainSetNumaParameters(virDomainPtr dom,
{ {
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
virDomainDef *def = NULL; virDomainDef *def = NULL;
virBitmap *nodeset = NULL; g_autoptr(virBitmap) nodeset = NULL;
virDomainNumatuneMemMode config_mode; virDomainNumatuneMemMode config_mode;
bool live; bool live;
size_t i; size_t i;
@ -3590,7 +3587,6 @@ testDomainSetNumaParameters(virDomainPtr dom,
ret = 0; ret = 0;
cleanup: cleanup:
virBitmapFree(nodeset);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -9669,7 +9665,7 @@ testDomainPinIOThread(virDomainPtr dom,
virDomainObj *vm; virDomainObj *vm;
virDomainDef *def; virDomainDef *def;
virDomainIOThreadIDDef *iothrid; virDomainIOThreadIDDef *iothrid;
virBitmap *cpumask = NULL; g_autoptr(virBitmap) cpumask = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG, -1); VIR_DOMAIN_AFFECT_CONFIG, -1);
@ -9702,7 +9698,6 @@ testDomainPinIOThread(virDomainPtr dom,
ret = 0; ret = 0;
cleanup: cleanup:
virBitmapFree(cpumask);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }