NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu_snapshot: fix reverting to inactive snapshot

Browse Source 
When reverting to inactive snapshot updating the domain definition needs
to happen after the new overlays are created otherwise qemu-img will
correctly fail with error:

    Trying to create an image with the same filename as the backing file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2023-11-01 14:01:32 +01:00
parent 03a9a39c42
commit 3ad5817053
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_snapshot.c
View File

@ -2157,13 +2157,20 @@ qemuSnapshotRevertExternalInactive(virDomainObj *vm,
{ {
virQEMUDriver *driver = QEMU_DOMAIN_PRIVATE(vm)->driver; virQEMUDriver *driver = QEMU_DOMAIN_PRIVATE(vm)->driver;
g_autoptr(virBitmap) created = NULL; g_autoptr(virBitmap) created = NULL;
int ret = -1;
created = virBitmapNew(tmpsnapdef->ndisks); created = virBitmapNew(tmpsnapdef->ndisks);
if (qemuSnapshotDomainDefUpdateDisk(domdef, tmpsnapdef, false) < 0) if (qemuSnapshotCreateQcow2Files(driver, domdef, tmpsnapdef, created) < 0)
return -1; goto cleanup;
if (qemuSnapshotCreateQcow2Files(driver, domdef, tmpsnapdef, created) < 0) { if (qemuSnapshotDomainDefUpdateDisk(domdef, tmpsnapdef, false) < 0)
goto cleanup;
ret = 0;
cleanup:
if (ret < 0 && created) {
ssize_t bit = -1; ssize_t bit = -1;
virErrorPtr err = NULL; virErrorPtr err = NULL;
@ -2180,11 +2187,9 @@ qemuSnapshotRevertExternalInactive(virDomainObj *vm,
} }
virErrorRestore(&err); virErrorRestore(&err);
return -1;
} }
return 0; return ret;
} }