提交 63aaf69b 编写于 作者: P Peter Krempa

conf: Fix virDomainObjGetDefs when getting persistent config on a live vm

If @flags contains only VIR_DOMAIN_AFFECT_CONFIG and @vm is active, the
function would return the active config rather than the persistent one
that it should return. This happened due to the fact that
virDomainObjGetDefs was checking the updated flags which may not contain
VIR_DOMAIN_AFFECT_LIVE if it is not requested even if @vm is active.

Additionally the function would not take the flags into account when
setting the pointers which was later used to determine whether the code
needs to update the given configuration.

The mistake was caught by the virt-test suite.
上级 f486bb04
...@@ -2933,11 +2933,11 @@ virDomainObjGetDefs(virDomainObjPtr vm, ...@@ -2933,11 +2933,11 @@ virDomainObjGetDefs(virDomainObjPtr vm,
if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
return -1; return -1;
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (virDomainObjIsActive(vm)) {
if (liveDef) if (liveDef && (flags & VIR_DOMAIN_AFFECT_LIVE))
*liveDef = vm->def; *liveDef = vm->def;
if (persDef) if (persDef && (flags & VIR_DOMAIN_AFFECT_CONFIG))
*persDef = vm->newDef; *persDef = vm->newDef;
} else { } else {
if (persDef) if (persDef)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册