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

libxl: unref libxlDriverConfig object

Browse Source 
Commits b6e19cf4 and 6472e54a missed unref'ing the
libxlDriverConfig object. Add missing calls to virObjectUnref.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2015-11-18 15:47:24 -07:00
parent a3c90fcb94
commit 97b56031a9
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libxl/libxl_driver.c
View File

@ -4648,18 +4648,21 @@ libxlDomainGetTotalCPUStats(libxlDriverPrivatePtr driver,
virTypedParameterPtr params, virTypedParameterPtr params,
unsigned int nparams) unsigned int nparams)
{ {
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlDriverConfigPtr cfg;
libxl_dominfo d_info; libxl_dominfo d_info;
int ret = -1; int ret = -1;
if (nparams == 0) if (nparams == 0)
return LIBXL_NB_TOTAL_CPU_STAT_PARAM; return LIBXL_NB_TOTAL_CPU_STAT_PARAM;
libxl_dominfo_init(&d_info);
cfg = libxlDriverConfigGet(driver);
if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxl_domain_info failed for domain '%d'"), _("libxl_domain_info failed for domain '%d'"),
vm->def->id); vm->def->id);
return ret; goto cleanup;
} }
if (virTypedParameterAssign(&params[0], VIR_DOMAIN_CPU_STATS_CPUTIME, if (virTypedParameterAssign(&params[0], VIR_DOMAIN_CPU_STATS_CPUTIME,
@ -4670,6 +4673,7 @@ libxlDomainGetTotalCPUStats(libxlDriverPrivatePtr driver,
cleanup: cleanup:
libxl_dominfo_dispose(&d_info); libxl_dominfo_dispose(&d_info);
virObjectUnref(cfg);
return ret; return ret;
} }
@ -4684,7 +4688,7 @@ libxlDomainGetPerCPUStats(libxlDriverPrivatePtr driver,
libxl_vcpuinfo *vcpuinfo; libxl_vcpuinfo *vcpuinfo;
int maxcpu, hostcpus; int maxcpu, hostcpus;
size_t i; size_t i;
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlDriverConfigPtr cfg;
int ret = -1; int ret = -1;
if (nparams == 0 && ncpus != 0) if (nparams == 0 && ncpus != 0)
@ -4692,12 +4696,13 @@ libxlDomainGetPerCPUStats(libxlDriverPrivatePtr driver,
else if (nparams == 0) else if (nparams == 0)
return vm->def->maxvcpus; return vm->def->maxvcpus;
cfg = libxlDriverConfigGet(driver);
if ((vcpuinfo = libxl_list_vcpu(cfg->ctx, vm->def->id, &maxcpu, if ((vcpuinfo = libxl_list_vcpu(cfg->ctx, vm->def->id, &maxcpu,
&hostcpus)) == NULL) { &hostcpus)) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to list vcpus for domain '%d' with libxenlight"), _("Failed to list vcpus for domain '%d' with libxenlight"),
vm->def->id); vm->def->id);
return ret; goto cleanup;
} }
for (i = start_cpu; i < maxcpu && i < ncpus; ++i) { for (i = start_cpu; i < maxcpu && i < ncpus; ++i) {
@ -4710,7 +4715,9 @@ libxlDomainGetPerCPUStats(libxlDriverPrivatePtr driver,
ret = nparams; ret = nparams;
cleanup: cleanup:
if (vcpuinfo)
libxl_vcpuinfo_list_free(vcpuinfo, maxcpu); libxl_vcpuinfo_list_free(vcpuinfo, maxcpu);
virObjectUnref(cfg);
return ret; return ret;
} }
@ -4766,7 +4773,7 @@ libxlDomainMemoryStats(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
libxlDriverPrivatePtr driver = dom->conn->privateData; libxlDriverPrivatePtr driver = dom->conn->privateData;
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlDriverConfigPtr cfg;
virDomainObjPtr vm; virDomainObjPtr vm;
libxl_dominfo d_info; libxl_dominfo d_info;
unsigned mem, maxmem; unsigned mem, maxmem;
@ -4775,6 +4782,8 @@ libxlDomainMemoryStats(virDomainPtr dom,
virCheckFlags(0, -1); virCheckFlags(0, -1);
cfg = libxlDriverConfigGet(driver);
if (!(vm = libxlDomObjFromDomain(dom))) if (!(vm = libxlDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
@ -4815,6 +4824,7 @@ libxlDomainMemoryStats(virDomainPtr dom,
cleanup: cleanup:
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectUnref(cfg);
return ret; return ret;
} }