External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuSnapshotCreateQcow2Files: use domain definition directly

Browse Source 
To create new overlay files when external snapshot revert support is
introduced we will be using different domain definition than what is
currently used by the domain.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2023-08-09 14:28:33 +02:00
parent 9b94a9e8ab
commit a8f3e2f104
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_snapshot.c
View File

@ -183,24 +183,25 @@ qemuSnapshotDomainDefUpdateDisk(virDomainDef *domdef,
/** /**
* qemuSnapshotCreateQcow2Files: * qemuSnapshotCreateQcow2Files:
* @vm: domain object * @driver: QEMU driver
* @def: domain definition
* @snapdef: snapshot definition * @snapdef: snapshot definition
* @created: bitmap to store which disks were created * @created: bitmap to store which disks were created
* *
* Create new qcow2 images based on snapshot definition @snapdef and use * Create new qcow2 images based on snapshot definition @snapdef and use
* domain object @vm as source for backing images. * domain definition @def as source for backing images.
* *
* Returns 0 on success, -1 on error. * Returns 0 on success, -1 on error.
*/ */
static int static int
qemuSnapshotCreateQcow2Files(virDomainObj *vm, qemuSnapshotCreateQcow2Files(virQEMUDriver *driver,
virDomainDef *def,
virDomainSnapshotDef *snapdef, virDomainSnapshotDef *snapdef,
virBitmap *created) virBitmap *created)
{ {
size_t i; size_t i;
const char *qemuImgPath; const char *qemuImgPath;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virQEMUDriver *driver = ((qemuDomainObjPrivate *) vm->privateData)->driver;
virDomainSnapshotDiskDef *snapdisk = NULL; virDomainSnapshotDiskDef *snapdisk = NULL;
virDomainDiskDef *defdisk = NULL; virDomainDiskDef *defdisk = NULL;
@ -210,7 +211,7 @@ qemuSnapshotCreateQcow2Files(virDomainObj *vm,
for (i = 0; i < snapdef->ndisks; i++) { for (i = 0; i < snapdef->ndisks; i++) {
g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) cmd = NULL;
snapdisk = &(snapdef->disks[i]); snapdisk = &(snapdef->disks[i]);
defdisk = vm->def->disks[i]; defdisk = def->disks[i];
if (snapdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) if (snapdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL)
continue; continue;
@ -278,7 +279,7 @@ qemuSnapshotCreateInactiveExternal(virQEMUDriver *driver,
/* If reuse is true, then qemuSnapshotPrepare already /* If reuse is true, then qemuSnapshotPrepare already
* ensured that the new files exist, and it was up to the user to * ensured that the new files exist, and it was up to the user to
* create them correctly. */ * create them correctly. */
if (!reuse && qemuSnapshotCreateQcow2Files(vm, snapdef, created) < 0) if (!reuse && qemuSnapshotCreateQcow2Files(driver, vm->def, snapdef, created) < 0)
goto cleanup; goto cleanup;
/* update disk definitions */ /* update disk definitions */