External/libvirt
1
0
Fork 0
Code

qemu: checkpoint: Write metadata of previously-'current' checkpoint on update

Browse Source 
Similarly to previous commit dealing with snapshots we must rewrite the
metadata of the previously-'current' checkpoint when changing which
checkpoint is considered 'current'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-23 12:51:23 +01:00
parent 5d8acaa8bc
commit 07620a0371
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qemu/qemu_checkpoint.c
View File

@ -41,6 +41,36 @@
VIR_LOG_INIT("qemu.qemu_checkpoint"); VIR_LOG_INIT("qemu.qemu_checkpoint");
/**
* qemuCheckpointSetCurrent: Set currently active checkpoint
*
* @vm: domain object
* @newcurrent: checkpoint object to set as current/active
*
* Sets @newcurrent as the 'current' checkpoint of @vm. This helper ensures that
* the checkpoint which was 'current' previously is updated.
*/
static void
qemuCheckpointSetCurrent(virDomainObjPtr vm,
virDomainMomentObjPtr newcurrent)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverPtr driver = priv->driver;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
virDomainMomentObjPtr oldcurrent = virDomainCheckpointGetCurrent(vm->checkpoints);
virDomainCheckpointSetCurrent(vm->checkpoints, newcurrent);
/* we need to write out metadata for the old checkpoint to update the
* 'active' property */
if (oldcurrent &&
oldcurrent != newcurrent) {
if (qemuCheckpointWriteMetadata(vm, oldcurrent, driver->xmlopt, cfg->checkpointDir) < 0)
VIR_WARN("failed to update old current checkpoint");
}
}
/* Looks up the domain object from checkpoint and unlocks the /* Looks up the domain object from checkpoint and unlocks the
* driver. The returned domain object is locked and ref'd and the * driver. The returned domain object is locked and ref'd and the
* caller must call virDomainObjEndAPI() on it. */ * caller must call virDomainObjEndAPI() on it. */
@ -506,7 +536,7 @@ qemuCheckpointCreateFinalize(virQEMUDriverPtr driver,
bool update_current) bool update_current)
{ {
if (update_current) if (update_current)
virDomainCheckpointSetCurrent(vm->checkpoints, chk); qemuCheckpointSetCurrent(vm, chk);
if (qemuCheckpointWriteMetadata(vm, chk, if (qemuCheckpointWriteMetadata(vm, chk,
driver->xmlopt, driver->xmlopt,
@ -848,7 +878,8 @@ qemuCheckpointDelete(virDomainObjPtr vm,
if (rem.err < 0) if (rem.err < 0)
goto endjob; goto endjob;
if (rem.found) { if (rem.found) {
virDomainCheckpointSetCurrent(vm->checkpoints, chk); qemuCheckpointSetCurrent(vm, chk);
if (flags & VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN_ONLY) { if (flags & VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN_ONLY) {
if (qemuCheckpointWriteMetadata(vm, chk, if (qemuCheckpointWriteMetadata(vm, chk,
driver->xmlopt, driver->xmlopt,