mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
Cope with missing swap cgroup controls
It is possible to build a kernel without swap cgroup controls present. This causes a fatal error when querying memory parameters. Treat missing swap controls as meaning "unlimited". The fatal error remains if the user tries to actually change the limit. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
95934171fb
commit
f493d83fbd
@ -7613,9 +7613,12 @@ qemuDomainGetMemoryParameters(virDomainPtr dom,
|
|||||||
case 2: /* fill swap hard limit here */
|
case 2: /* fill swap hard limit here */
|
||||||
rc = virCgroupGetMemSwapHardLimit(priv->cgroup, &val);
|
rc = virCgroupGetMemSwapHardLimit(priv->cgroup, &val);
|
||||||
if (rc != 0) {
|
if (rc != 0) {
|
||||||
virReportSystemError(-rc, "%s",
|
if (rc != -ENOENT) {
|
||||||
_("unable to get swap hard limit"));
|
virReportSystemError(-rc, "%s",
|
||||||
goto cleanup;
|
_("unable to get swap hard limit"));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
val = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
|
||||||
}
|
}
|
||||||
if (virTypedParameterAssign(param,
|
if (virTypedParameterAssign(param,
|
||||||
VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT,
|
VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT,
|
||||||
|
Loading…
Reference in New Issue
Block a user