提交 ac4a12db 编写于 作者: J Jim Fehlig

libxl: don't set hasManagedSave when performing save

libxlDoDomainSave() is used in both the save and managedsave code
paths but was unconditionally setting hasManagedSave to true on
success. As a result, undefine would fail after a non-managed
save/restore operation. E.g.

virsh define; virsh start
virsh save; virsh restore
virsh shutdown
virsh undefine
error: Refusing to undefine while domain managed save image exists

Modify libxlDoDomainSave() to take an additional parameter to
specify managed vs non-managed save, and change callers to use it.
Signed-off-by: NJim Fehlig <jfehlig@suse.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 f50ad2ff
...@@ -1653,8 +1653,10 @@ libxlDomainGetState(virDomainPtr dom, ...@@ -1653,8 +1653,10 @@ libxlDomainGetState(virDomainPtr dom,
* virDomainObjPtr must be locked on invocation * virDomainObjPtr must be locked on invocation
*/ */
static int static int
libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, libxlDoDomainSave(libxlDriverPrivatePtr driver,
const char *to) virDomainObjPtr vm,
const char *to,
bool managed)
{ {
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
libxlSavefileHeader hdr; libxlSavefileHeader hdr;
...@@ -1725,7 +1727,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ...@@ -1725,7 +1727,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
} }
libxlDomainCleanup(driver, vm); libxlDomainCleanup(driver, vm);
vm->hasManagedSave = true; vm->hasManagedSave = managed;
ret = 0; ret = 0;
cleanup: cleanup:
...@@ -1772,7 +1774,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, ...@@ -1772,7 +1774,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
if (libxlDoDomainSave(driver, vm, to) < 0) if (libxlDoDomainSave(driver, vm, to, false) < 0)
goto endjob; goto endjob;
if (!vm->persistent) if (!vm->persistent)
...@@ -1989,7 +1991,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) ...@@ -1989,7 +1991,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags)
VIR_INFO("Saving state to %s", name); VIR_INFO("Saving state to %s", name);
if (libxlDoDomainSave(driver, vm, name) < 0) if (libxlDoDomainSave(driver, vm, name, true) < 0)
goto endjob; goto endjob;
if (!vm->persistent) if (!vm->persistent)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册