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

qemu: update domain live xml for virsh memtune with --live flag

Browse Source 
virsh subcommand memtune forgot updating domain live xml
after setting cgroup value.
(cherry picked from commit 0047d5d6e8)
This commit is contained in:
Guannan Ren 2013-03-06 00:24:57 +08:00 committed by Doug Goldstein
parent a462372cef
commit 2102e03dc7
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/qemu/qemu_driver.c
View File

@ -7303,11 +7303,13 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
}
if (set_swap_hard_limit) {
if (flags & VIR_DOMAIN_AFFECT_LIVE &&
(rc = virCgroupSetMemSwapHardLimit(group, swap_hard_limit)) < 0) {
virReportSystemError(-rc, "%s",
_("unable to set memory swap_hard_limit tunable"));
goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
if ((rc = virCgroupSetMemSwapHardLimit(group, swap_hard_limit)) < 0) {
virReportSystemError(-rc, "%s",
_("unable to set memory swap_hard_limit tunable"));
goto cleanup;
}
vm->def->mem.swap_hard_limit = swap_hard_limit;
}
if (flags & VIR_DOMAIN_AFFECT_CONFIG)
@ -7315,11 +7317,13 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
}
if (set_memory_hard_limit) {
if (flags & VIR_DOMAIN_AFFECT_LIVE &&
(rc = virCgroupSetMemoryHardLimit(group, memory_hard_limit)) < 0) {
virReportSystemError(-rc, "%s",
_("unable to set memory hard_limit tunable"));
goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
if ((rc = virCgroupSetMemoryHardLimit(group, memory_hard_limit)) < 0) {
virReportSystemError(-rc, "%s",
_("unable to set memory hard_limit tunable"));
goto cleanup;
}
vm->def->mem.hard_limit = memory_hard_limit;
}
if (flags & VIR_DOMAIN_AFFECT_CONFIG)
@ -7327,11 +7331,13 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
}
if (set_memory_soft_limit) {
if (flags & VIR_DOMAIN_AFFECT_LIVE &&
(rc = virCgroupSetMemorySoftLimit(group, memory_soft_limit)) < 0) {
virReportSystemError(-rc, "%s",
_("unable to set memory soft_limit tunable"));
goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
if ((rc = virCgroupSetMemorySoftLimit(group, memory_soft_limit)) < 0) {
virReportSystemError(-rc, "%s",
_("unable to set memory soft_limit tunable"));
goto cleanup;
}
vm->def->mem.soft_limit = memory_soft_limit;
}
if (flags & VIR_DOMAIN_AFFECT_CONFIG)