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

virDomainSnapshotAlignDisks: Allow overriding user-configured snapshot default

Browse Source 
This new option will be used by external snapshot revert code.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2023-04-12 14:54:20 +02:00
parent 206ff69832
commit 8f9d96199d
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/snapshot_conf.c
View File

@ -581,6 +581,8 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDef *def,
* @default_snapshot: snapshot location to assign to disks which don't have any * @default_snapshot: snapshot location to assign to disks which don't have any
* @uniform_internal_snapshot: Require that for an internal snapshot all disks * @uniform_internal_snapshot: Require that for an internal snapshot all disks
* take part in the internal snapshot * take part in the internal snapshot
* @force_default_location: Always use @default_snapshot even if domain def
* has different default value
* *
* Align snapdef->disks to domain definition, filling in any missing disks or * Align snapdef->disks to domain definition, filling in any missing disks or
* snapshot state defaults given by the domain, with a fallback to * snapshot state defaults given by the domain, with a fallback to
@ -598,6 +600,10 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDef *def,
* in the internal snapshot. This is for hypervisors where granularity of an * in the internal snapshot. This is for hypervisors where granularity of an
* internal snapshot can't be controlled. * internal snapshot can't be controlled.
* *
* When @force_default_location is true we will always use @default_snapshot
* even if domain definition has different default set. This is required to
* create new snapshot definition when reverting external snapshots.
*
* Convert paths to disk targets for uniformity. * Convert paths to disk targets for uniformity.
* *
* On error -1 is returned and a libvirt error is reported. * On error -1 is returned and a libvirt error is reported.
@ -606,7 +612,8 @@ int
virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef, virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef,
virDomainDef *existingDomainDef, virDomainDef *existingDomainDef,
virDomainSnapshotLocation default_snapshot, virDomainSnapshotLocation default_snapshot,
bool uniform_internal_snapshot) bool uniform_internal_snapshot,
bool force_default_location)
{ {
virDomainDef *domdef = snapdef->parent.dom; virDomainDef *domdef = snapdef->parent.dom;
g_autoptr(GHashTable) map = virHashNew(NULL); g_autoptr(GHashTable) map = virHashNew(NULL);
@ -714,7 +721,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef,
/* Don't snapshot empty drives */ /* Don't snapshot empty drives */
if (virStorageSourceIsEmpty(domdef->disks[i]->src)) if (virStorageSourceIsEmpty(domdef->disks[i]->src))
snapdisk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO; snapdisk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
else else if (!force_default_location)
snapdisk->snapshot = domdef->disks[i]->snapshot; snapdisk->snapshot = domdef->disks[i]->snapshot;
snapdisk->src->type = VIR_STORAGE_TYPE_FILE; snapdisk->src->type = VIR_STORAGE_TYPE_FILE;
@ -970,8 +977,10 @@ virDomainSnapshotRedefinePrep(virDomainObj *vm,
virDomainSnapshotDefIsExternal(snapdef)) virDomainSnapshotDefIsExternal(snapdef))
align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
if (virDomainSnapshotAlignDisks(snapdef, otherDomDef, align_location, true) < 0) if (virDomainSnapshotAlignDisks(snapdef, otherDomDef, align_location,
true, false) < 0) {
return -1; return -1;
}
return 0; return 0;
} }

3
src/conf/snapshot_conf.h
View File

@ -126,7 +126,8 @@ char *virDomainSnapshotDefFormat(const char *uuidstr,
int virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapshot, int virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapshot,
virDomainDef *existingDomainDef, virDomainDef *existingDomainDef,
virDomainSnapshotLocation default_snapshot, virDomainSnapshotLocation default_snapshot,
bool uniform_internal_snapshot); bool uniform_internal_snapshot,
bool force_default_location);
bool virDomainSnapshotDefIsExternal(virDomainSnapshotDef *def); bool virDomainSnapshotDefIsExternal(virDomainSnapshotDef *def);
bool virDomainSnapshotIsExternal(virDomainMomentObj *snap); bool virDomainSnapshotIsExternal(virDomainMomentObj *snap);

2
src/qemu/qemu_snapshot.c
View File

@ -1585,7 +1585,7 @@ qemuSnapshotCreateAlignDisks(virDomainObj *vm,
else else
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
} }
if (virDomainSnapshotAlignDisks(def, NULL, align_location, true) < 0) if (virDomainSnapshotAlignDisks(def, NULL, align_location, true, false) < 0)
return -1; return -1;
return 0; return 0;

2
src/test/test_driver.c
View File

@ -8724,7 +8724,7 @@ testDomainSnapshotAlignDisks(virDomainObj *vm,
VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
} }
return virDomainSnapshotAlignDisks(def, NULL, align_location, true); return virDomainSnapshotAlignDisks(def, NULL, align_location, true, false);
} }