External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_snapshot: remove revertdisks when creating new snapshot

Browse Source 
When user creates a new snapshot after reverting to non-leaf snapshot we
no longer need to store the temporary overlays as they will be part of
the VM XMLs stored in the newly created snapshot.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2023-05-22 14:32:35 +02:00
parent a68b849c51
commit 1392be7092
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_snapshot.c
View File

@ -1659,6 +1659,28 @@ qemuSnapshotCreateWriteMetadata(virDomainObj *vm,
} }
static void
qemuSnapshotClearRevertdisks(virDomainMomentObj *current)
{
virDomainSnapshotDef *curdef = NULL;
if (!current)
return;
curdef = virDomainSnapshotObjGetDef(current);
if (curdef->revertdisks) {
size_t i;
for (i = 0; i < curdef->nrevertdisks; i++)
virDomainSnapshotDiskDefClear(&curdef->revertdisks[i]);
g_clear_pointer(&curdef->revertdisks, g_free);
curdef->nrevertdisks = 0;
}
}
static virDomainSnapshotPtr static virDomainSnapshotPtr
qemuSnapshotRedefine(virDomainObj *vm, qemuSnapshotRedefine(virDomainObj *vm,
virDomainPtr domain, virDomainPtr domain,
@ -1668,6 +1690,7 @@ qemuSnapshotRedefine(virDomainObj *vm,
unsigned int flags) unsigned int flags)
{ {
virDomainMomentObj *snap = NULL; virDomainMomentObj *snap = NULL;
virDomainMomentObj *current = virDomainSnapshotGetCurrent(vm->snapshots);
virDomainSnapshotPtr ret = NULL; virDomainSnapshotPtr ret = NULL;
g_autoptr(virDomainSnapshotDef) snapdef = virObjectRef(snapdeftmp); g_autoptr(virDomainSnapshotDef) snapdef = virObjectRef(snapdeftmp);
@ -1685,8 +1708,10 @@ qemuSnapshotRedefine(virDomainObj *vm,
* makes sense, such as checking that qemu-img recognizes the * makes sense, such as checking that qemu-img recognizes the
* snapshot name in at least one of the domain's disks? */ * snapshot name in at least one of the domain's disks? */
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) {
qemuSnapshotClearRevertdisks(current);
qemuSnapshotSetCurrent(vm, snap); qemuSnapshotSetCurrent(vm, snap);
}
if (qemuSnapshotCreateWriteMetadata(vm, snap, driver, cfg) < 0) if (qemuSnapshotCreateWriteMetadata(vm, snap, driver, cfg) < 0)
goto error; goto error;
@ -1765,6 +1790,7 @@ qemuSnapshotCreate(virDomainObj *vm,
} }
if (!tmpsnap) { if (!tmpsnap) {
qemuSnapshotClearRevertdisks(current);
qemuSnapshotSetCurrent(vm, snap); qemuSnapshotSetCurrent(vm, snap);
if (qemuSnapshotCreateWriteMetadata(vm, snap, driver, cfg) < 0) if (qemuSnapshotCreateWriteMetadata(vm, snap, driver, cfg) < 0)