External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: allow getting < max typed parameters

Browse Source 
Allow the user to call with nparams too small, per API documentation.
Also, libvirt.c filters out nparams of 0 for scheduler parameters.

* src/lxc/lxc_driver.c (lxcDomainGetMemoryParameters): Allow fewer
than max.
(lxcGetSchedulerParametersFlags): Drop redundant check.
This commit is contained in:
Eric Blake 2011-11-02 11:50:08 -06:00
parent 1367954702
commit f4e584decf
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/lxc_driver.c
View File

@ -901,11 +901,6 @@ static int lxcDomainGetMemoryParameters(virDomainPtr dom,
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
if ((*nparams) < LXC_NB_MEM_PARAM) {
lxcError(VIR_ERR_INVALID_ARG,
"%s", _("Invalid parameter count"));
goto cleanup;
}
if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) { if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) {
lxcError(VIR_ERR_INTERNAL_ERROR, lxcError(VIR_ERR_INTERNAL_ERROR,
@ -913,7 +908,7 @@ static int lxcDomainGetMemoryParameters(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
for (i = 0; i < LXC_NB_MEM_PARAM; i++) { for (i = 0; i < LXC_NB_MEM_PARAM && i < *nparams; i++) {
virTypedParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
val = 0; val = 0;
param->value.ul = 0; param->value.ul = 0;
@ -971,7 +966,8 @@ static int lxcDomainGetMemoryParameters(virDomainPtr dom,
} }
} }
*nparams = LXC_NB_MEM_PARAM; if (*nparams > LXC_NB_MEM_PARAM)
*nparams = LXC_NB_MEM_PARAM;
ret = 0; ret = 0;
cleanup: cleanup:
@ -2580,12 +2576,6 @@ lxcGetSchedulerParametersFlags(virDomainPtr domain,
if (driver->cgroup == NULL) if (driver->cgroup == NULL)
return -1; return -1;
if (*nparams < 1) {
lxcError(VIR_ERR_INVALID_ARG,
"%s", _("Invalid parameter count"));
return -1;
}
lxcDriverLock(driver); lxcDriverLock(driver);
vm = virDomainFindByUUID(&driver->domains, domain->uuid); vm = virDomainFindByUUID(&driver->domains, domain->uuid);