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

qemu: driver: Automatically free temporary virBitmap-s

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 17:21:17 +01:00
parent 0b18972630
commit 4ab26d3e3e
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/qemu/qemu_driver.c
View File

@ -1474,13 +1474,12 @@ qemuDomainHelperGetVcpus(virDomainObj *vm,
if (cpumaps) { if (cpumaps) {
unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, ncpuinfo); unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, ncpuinfo);
virBitmap *map = NULL; g_autoptr(virBitmap) map = NULL;
if (!(map = virProcessGetAffinity(vcpupid))) if (!(map = virProcessGetAffinity(vcpupid)))
return -1; return -1;
virBitmapToDataBuf(map, cpumap, maplen); virBitmapToDataBuf(map, cpumap, maplen);
virBitmapFree(map);
} }
if (cpuwait) { if (cpuwait) {
@ -4495,7 +4494,7 @@ qemuDomainPinVcpuLive(virDomainObj *vm,
virQEMUDriver *driver, virQEMUDriver *driver,
virBitmap *cpumap) virBitmap *cpumap)
{ {
virBitmap *tmpmap = NULL; g_autoptr(virBitmap) tmpmap = NULL;
virDomainVcpuDef *vcpuinfo; virDomainVcpuDef *vcpuinfo;
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
g_autoptr(virCgroup) cgroup_vcpu = NULL; g_autoptr(virCgroup) cgroup_vcpu = NULL;
@ -4541,8 +4540,7 @@ qemuDomainPinVcpuLive(virDomainObj *vm,
} }
virBitmapFree(vcpuinfo->cpumask); virBitmapFree(vcpuinfo->cpumask);
vcpuinfo->cpumask = tmpmap; vcpuinfo->cpumask = g_steal_pointer(&tmpmap);
tmpmap = NULL;
qemuDomainSaveStatus(vm); qemuDomainSaveStatus(vm);
@ -4560,7 +4558,6 @@ qemuDomainPinVcpuLive(virDomainObj *vm,
ret = 0; ret = 0;
cleanup: cleanup:
virBitmapFree(tmpmap);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return ret; return ret;
} }
@ -4578,7 +4575,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virDomainDef *def; virDomainDef *def;
virDomainDef *persistentDef; virDomainDef *persistentDef;
int ret = -1; int ret = -1;
virBitmap *pcpumap = NULL; g_autoptr(virBitmap) pcpumap = NULL;
virDomainVcpuDef *vcpuinfo = NULL; virDomainVcpuDef *vcpuinfo = NULL;
g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL;
@ -4622,8 +4619,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
if (persistentDef) { if (persistentDef) {
virBitmapFree(vcpuinfo->cpumask); virBitmapFree(vcpuinfo->cpumask);
vcpuinfo->cpumask = pcpumap; vcpuinfo->cpumask = g_steal_pointer(&pcpumap);
pcpumap = NULL;
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir); ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob; goto endjob;
@ -4636,7 +4632,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virBitmapFree(pcpumap);
return ret; return ret;
} }
@ -4702,7 +4697,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
virDomainDef *persistentDef; virDomainDef *persistentDef;
int ret = -1; int ret = -1;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
virBitmap *pcpumap = NULL; g_autoptr(virBitmap) pcpumap = NULL;
g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
g_autofree char *str = NULL; g_autofree char *str = NULL;
@ -4785,7 +4780,6 @@ qemuDomainPinEmulator(virDomainPtr dom,
cleanup: cleanup:
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virBitmapFree(pcpumap);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -5011,7 +5005,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriver *driver,
info_ret = g_new0(virDomainIOThreadInfoPtr, niothreads); info_ret = g_new0(virDomainIOThreadInfoPtr, niothreads);
for (i = 0; i < niothreads; i++) { for (i = 0; i < niothreads; i++) {
virBitmap *map = NULL; g_autoptr(virBitmap) map = NULL;
info_ret[i] = g_new0(virDomainIOThreadInfo, 1); info_ret[i] = g_new0(virDomainIOThreadInfo, 1);
info_ret[i]->iothread_id = iothreads[i]->iothread_id; info_ret[i]->iothread_id = iothreads[i]->iothread_id;
@ -5019,12 +5013,8 @@ qemuDomainGetIOThreadsLive(virQEMUDriver *driver,
if (!(map = virProcessGetAffinity(iothreads[i]->thread_id))) if (!(map = virProcessGetAffinity(iothreads[i]->thread_id)))
goto endjob; goto endjob;
if (virBitmapToData(map, &info_ret[i]->cpumap, if (virBitmapToData(map, &info_ret[i]->cpumap, &info_ret[i]->cpumaplen) < 0)
&info_ret[i]->cpumaplen) < 0) {
virBitmapFree(map);
goto endjob; goto endjob;
}
virBitmapFree(map);
} }
*info = g_steal_pointer(&info_ret); *info = g_steal_pointer(&info_ret);
@ -5094,7 +5084,7 @@ qemuDomainPinIOThread(virDomainPtr dom,
virDomainObj *vm; virDomainObj *vm;
virDomainDef *def; virDomainDef *def;
virDomainDef *persistentDef; virDomainDef *persistentDef;
virBitmap *pcpumap = NULL; g_autoptr(virBitmap) pcpumap = NULL;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
g_autoptr(virCgroup) cgroup_iothread = NULL; g_autoptr(virCgroup) cgroup_iothread = NULL;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -5208,7 +5198,6 @@ qemuDomainPinIOThread(virDomainPtr dom,
cleanup: cleanup:
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virBitmapFree(pcpumap);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -8840,7 +8829,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
int ret = -1; int ret = -1;
g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
virBitmap *nodeset = NULL; g_autoptr(virBitmap) nodeset = NULL;
virDomainNumatuneMemMode config_mode; virDomainNumatuneMemMode config_mode;
int mode = -1; int mode = -1;
@ -8947,7 +8936,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
virBitmapFree(nodeset);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -16573,7 +16561,7 @@ qemuDomainGetCPUStats(virDomainPtr domain,
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
int ret = -1; int ret = -1;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
virBitmap *guestvcpus = NULL; g_autoptr(virBitmap) guestvcpus = NULL;
virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
@ -16605,7 +16593,6 @@ qemuDomainGetCPUStats(virDomainPtr domain,
ret = virCgroupGetPercpuStats(priv->cgroup, params, nparams, ret = virCgroupGetPercpuStats(priv->cgroup, params, nparams,
start_cpu, ncpus, guestvcpus); start_cpu, ncpus, guestvcpus);
cleanup: cleanup:
virBitmapFree(guestvcpus);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -19379,9 +19366,9 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr *params,
virTypedParameterPtr par = NULL; virTypedParameterPtr par = NULL;
int npar = 0; int npar = 0;
int maxpar = 0; int maxpar = 0;
virBitmap *vcpus = virBitmapNew(QEMU_GUEST_VCPU_MAX_ID); g_autoptr(virBitmap) vcpus = virBitmapNew(QEMU_GUEST_VCPU_MAX_ID);
virBitmap *online = virBitmapNew(QEMU_GUEST_VCPU_MAX_ID); g_autoptr(virBitmap) online = virBitmapNew(QEMU_GUEST_VCPU_MAX_ID);
virBitmap *offlinable = virBitmapNew(QEMU_GUEST_VCPU_MAX_ID); g_autoptr(virBitmap) offlinable = virBitmapNew(QEMU_GUEST_VCPU_MAX_ID);
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
size_t i; size_t i;
int ret = -1; int ret = -1;
@ -19418,9 +19405,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr *params,
ret = 0; ret = 0;
cleanup: cleanup:
virBitmapFree(vcpus);
virBitmapFree(online);
virBitmapFree(offlinable);
virTypedParamsFree(par, npar); virTypedParamsFree(par, npar);
return ret; return ret;
} }
@ -19483,7 +19467,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom,
{ {
virQEMUDriver *driver = dom->conn->privateData; virQEMUDriver *driver = dom->conn->privateData;
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
virBitmap *map = NULL; g_autoptr(virBitmap) map = NULL;
qemuAgentCPUInfo *info = NULL; qemuAgentCPUInfo *info = NULL;
qemuAgent *agent; qemuAgent *agent;
int ninfo = 0; int ninfo = 0;
@ -19556,7 +19540,6 @@ qemuDomainSetGuestVcpus(virDomainPtr dom,
cleanup: cleanup:
VIR_FREE(info); VIR_FREE(info);
virBitmapFree(map);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -19572,7 +19555,7 @@ qemuDomainSetVcpu(virDomainPtr dom,
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
virDomainDef *def = NULL; virDomainDef *def = NULL;
virDomainDef *persistentDef = NULL; virDomainDef *persistentDef = NULL;
virBitmap *map = NULL; g_autoptr(virBitmap) map = NULL;
ssize_t lastvcpu; ssize_t lastvcpu;
int ret = -1; int ret = -1;
@ -19629,7 +19612,6 @@ qemuDomainSetVcpu(virDomainPtr dom,
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
virBitmapFree(map);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }