External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_snapshot: add support to delete external snapshot without block commit

Browse Source 
When block commit is not needed we can just simply unlink the
disk files.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2023-06-27 15:59:25 +02:00
parent d84538fbad
commit 7c402396ec
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/qemu/qemu_snapshot.c
View File

@ -2563,6 +2563,7 @@ typedef struct _qemuSnapshotDeleteExternalData {
virStorageSource *prevDiskSrc; /* source of disk for which @diskSrc is virStorageSource *prevDiskSrc; /* source of disk for which @diskSrc is
backing disk */ backing disk */
qemuBlockJobData *job; qemuBlockJobData *job;
bool merge;
} qemuSnapshotDeleteExternalData; } qemuSnapshotDeleteExternalData;
@ -2664,6 +2665,7 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
data = g_new0(qemuSnapshotDeleteExternalData, 1); data = g_new0(qemuSnapshotDeleteExternalData, 1);
data->snapDisk = snapDisk; data->snapDisk = snapDisk;
data->merge = merge;
data->parentDomDisk = virDomainDiskByTarget(snapdef->parent.dom, data->parentDomDisk = virDomainDiskByTarget(snapdef->parent.dom,
data->snapDisk->name); data->snapDisk->name);
@ -2674,7 +2676,7 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
return -1; return -1;
} }
if (merge) { if (data->merge) {
data->domDisk = qemuDomainDiskByName(vm->def, snapDisk->name); data->domDisk = qemuDomainDiskByName(vm->def, snapDisk->name);
if (!data->domDisk) if (!data->domDisk)
return -1; return -1;
@ -3114,31 +3116,42 @@ qemuSnapshotDiscardExternal(virDomainObj *vm,
virTristateBool autofinalize = VIR_TRISTATE_BOOL_NO; virTristateBool autofinalize = VIR_TRISTATE_BOOL_NO;
unsigned int commitFlags = VIR_DOMAIN_BLOCK_COMMIT_DELETE; unsigned int commitFlags = VIR_DOMAIN_BLOCK_COMMIT_DELETE;
if (data->domDisk->src == data->diskSrc) { if (data->merge) {
commitFlags |= VIR_DOMAIN_BLOCK_COMMIT_ACTIVE; if (data->domDisk->src == data->diskSrc) {
autofinalize = VIR_TRISTATE_BOOL_YES; commitFlags |= VIR_DOMAIN_BLOCK_COMMIT_ACTIVE;
autofinalize = VIR_TRISTATE_BOOL_YES;
}
if (qemuSnapshotSetInvalid(vm, data->parentSnap, data->snapDisk, true) < 0)
goto error;
data->job = qemuBlockCommit(vm,
data->domDisk,
data->parentDiskSrc,
data->diskSrc,
data->prevDiskSrc,
0,
VIR_ASYNC_JOB_SNAPSHOT,
autofinalize,
commitFlags);
if (!data->job)
goto error;
} else {
if (virStorageSourceInit(data->parentDomDisk->src) < 0 ||
virStorageSourceUnlink(data->parentDomDisk->src) < 0) {
VIR_WARN("Failed to remove snapshot image '%s'",
data->snapDisk->name);
}
} }
if (qemuSnapshotSetInvalid(vm, data->parentSnap, data->snapDisk, true) < 0)
goto error;
data->job = qemuBlockCommit(vm,
data->domDisk,
data->parentDiskSrc,
data->diskSrc,
data->prevDiskSrc,
0,
VIR_ASYNC_JOB_SNAPSHOT,
autofinalize,
commitFlags);
if (!data->job)
goto error;
} }
for (cur = externalData; cur; cur = g_slist_next(cur)) { for (cur = externalData; cur; cur = g_slist_next(cur)) {
qemuSnapshotDeleteExternalData *data = cur->data; qemuSnapshotDeleteExternalData *data = cur->data;
if (!data->merge)
continue;
if (qemuSnapshotDeleteBlockJobRunning(vm, data->job) < 0) if (qemuSnapshotDeleteBlockJobRunning(vm, data->job) < 0)
goto error; goto error;
@ -3153,6 +3166,9 @@ qemuSnapshotDiscardExternal(virDomainObj *vm,
for (cur = externalData; cur; cur = g_slist_next(cur)) { for (cur = externalData; cur; cur = g_slist_next(cur)) {
qemuSnapshotDeleteExternalData *data = cur->data; qemuSnapshotDeleteExternalData *data = cur->data;
if (!data->merge)
continue;
if (data->job->state == QEMU_BLOCKJOB_STATE_READY) { if (data->job->state == QEMU_BLOCKJOB_STATE_READY) {
if (qemuBlockPivot(vm, data->job, VIR_ASYNC_JOB_SNAPSHOT, NULL) < 0) if (qemuBlockPivot(vm, data->job, VIR_ASYNC_JOB_SNAPSHOT, NULL) < 0)
goto error; goto error;