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

LXC from native: migrate memory tuning

Browse Source
This commit is contained in:
Cédric Bosdonnat
2014-02-05 15:10:09 +01:00
committed by Daniel P. Berrange
parent 99d8cddfbe
commit 13b9946eb5
4 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lxc/lxc_native.c
View File

@@ -607,6 +607,42 @@ lxcIdmapWalkCallback(const char *name, virConfValuePtr value, void *data)
return 0;
}
static int
lxcSetMemTune(virDomainDefPtr def, virConfPtr properties)
{
virConfValuePtr value;
unsigned long long size = 0;
if ((value = virConfGetValue(properties,
"lxc.cgroup.memory.limit_in_bytes")) &&
value->str && STRNEQ(value->str, "-1")) {
if (lxcConvertSize(value->str, &size) < 0)
return -1;
size = size / 1024;
def->mem.max_balloon = size;
def->mem.hard_limit = size;
}
if ((value = virConfGetValue(properties,
"lxc.cgroup.memory.soft_limit_in_bytes")) &&
value->str && STRNEQ(value->str, "-1")) {
if (lxcConvertSize(value->str, &size) < 0)
return -1;
def->mem.soft_limit = size / 1024;
}
if ((value = virConfGetValue(properties,
"lxc.cgroup.memory.memsw.limit_in_bytes")) &&
value->str && STRNEQ(value->str, "-1")) {
if (lxcConvertSize(value->str, &size) < 0)
return -1;
def->mem.swap_hard_limit = size / 1024;
}
return 0;
}
virDomainDefPtr
lxcParseConfigString(const char *config)
{
@@ -679,6 +715,10 @@ lxcParseConfigString(const char *config)
if (virConfWalk(properties, lxcIdmapWalkCallback, vmdef) < 0)
goto error;
/* lxc.cgroup.memory.* */
if (lxcSetMemTune(vmdef, properties) < 0)
goto error;
goto cleanup;
error: