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: implement the new flags for setting memory parameters

Browse Source 
* src/qemu/qemu_driver.c: update qemuDomainSetMemoryParameters to
  look at the flag parameter and depending on it save the config
  or the live amount
This commit is contained in:
Hu Tao 2011-05-27 15:47:41 +08:00 committed by Daniel Veillard
parent 7639d1ef31
commit 4b997daaf5
1 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/qemu/qemu_driver.c
View File

@ -4860,20 +4860,20 @@ cleanup:
static int qemuDomainSetMemoryParameters(virDomainPtr dom, static int qemuDomainSetMemoryParameters(virDomainPtr dom,
virMemoryParameterPtr params, virMemoryParameterPtr params,
int nparams, int nparams,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags)
{ {
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
int i; int i;
virDomainDefPtr persistentDef = NULL;
virCgroupPtr group = NULL; virCgroupPtr group = NULL;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
bool isActive;
virCheckFlags(VIR_DOMAIN_MEMORY_PARAM_LIVE |
VIR_DOMAIN_MEMORY_PARAM_CONFIG, -1);
qemuDriverLock(driver); qemuDriverLock(driver);
if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) {
qemuReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cgroup memory controller is not mounted"));
goto cleanup;
}
vm = virDomainFindByUUID(&driver->domains, dom->uuid); vm = virDomainFindByUUID(&driver->domains, dom->uuid);
@ -4883,16 +4883,43 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
if (!virDomainObjIsActive(vm)) { isActive = virDomainObjIsActive(vm);
qemuReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running")); if (flags == VIR_DOMAIN_MEMORY_PARAM_CURRENT) {
goto cleanup; if (isActive)
flags = VIR_DOMAIN_MEMORY_PARAM_LIVE;
else
flags = VIR_DOMAIN_MEMORY_PARAM_CONFIG;
} }
if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) { if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, if (!isActive) {
_("cannot find cgroup for domain %s"), vm->def->name); qemuReportError(VIR_ERR_OPERATION_INVALID,
goto cleanup; "%s", _("domain is not running"));
goto cleanup;
}
if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) {
qemuReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cgroup memory controller is not mounted"));
goto cleanup;
}
if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot find cgroup for domain %s"), vm->def->name);
goto cleanup;
}
}
if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) {
if (!vm->persistent) {
qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot change persistent config of a transient domain"));
goto cleanup;
}
if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm)))
goto cleanup;
} }
ret = 0; ret = 0;
@ -4908,11 +4935,17 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
continue; continue;
} }
rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) {
if (rc != 0) { rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul);
virReportSystemError(-rc, "%s", if (rc != 0) {
_("unable to set memory hard_limit tunable")); virReportSystemError(-rc, "%s",
ret = -1; _("unable to set memory hard_limit tunable"));
ret = -1;
}
}
if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) {
persistentDef->mem.hard_limit = params[i].value.ul;
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) {
int rc; int rc;
@ -4923,11 +4956,17 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
continue; continue;
} }
rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) {
if (rc != 0) { rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul);
virReportSystemError(-rc, "%s", if (rc != 0) {
_("unable to set memory soft_limit tunable")); virReportSystemError(-rc, "%s",
ret = -1; _("unable to set memory soft_limit tunable"));
ret = -1;
}
}
if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) {
persistentDef->mem.soft_limit = params[i].value.ul;
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) {
int rc; int rc;
@ -4938,11 +4977,16 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
continue; continue;
} }
rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) {
if (rc != 0) { rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul);
virReportSystemError(-rc, "%s", if (rc != 0) {
_("unable to set swap_hard_limit tunable")); virReportSystemError(-rc, "%s",
ret = -1; _("unable to set swap_hard_limit tunable"));
ret = -1;
}
}
if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) {
persistentDef->mem.swap_hard_limit = params[i].value.ul;
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) {
qemuReportError(VIR_ERR_INVALID_ARG, qemuReportError(VIR_ERR_INVALID_ARG,
@ -4955,6 +4999,10 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
} }
} }
if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) {
ret = virDomainSaveConfig(driver->configDir, persistentDef);
}
cleanup: cleanup:
virCgroupFree(&group); virCgroupFree(&group);
if (vm) if (vm)