提交 2102e03d 编写于 作者: G Guannan Ren 提交者: Doug Goldstein

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

virsh subcommand memtune forgot updating domain live xml
after setting cgroup value.
(cherry picked from commit 0047d5d6)
上级 a462372c
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册