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

virDomainSnapshotRedefinePrep: Don't do partial redefine

Browse Source 
'virDomainSnapshotRedefinePrep' does everything needed for a redefine
when the snapshot exists but not when we are defining metadata for a new
snapshot. This gives us weird semantics.

Extract the code for replacing the definition of an existing snapshot
into a new helper 'virDomainSnapshotReplaceDef' and refactor all
callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-01-12 17:00:22 +01:00
parent d281c1323f
commit 717f1cc4d1
7 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/snapshot_conf.c
View File

@ -957,12 +957,11 @@ virDomainSnapshotIsExternal(virDomainMomentObj *snap)
int
virDomainSnapshotRedefinePrep(virDomainObj *vm,
virDomainSnapshotDef **defptr,
virDomainSnapshotDef *snapdef,
virDomainMomentObj **snap,
virDomainXMLOption *xmlopt,
unsigned int flags)
{
virDomainSnapshotDef *snapdef = *defptr;
virDomainMomentObj *other;
virDomainSnapshotDef *otherSnapDef = NULL;
virDomainDef *otherDomDef = NULL;
@ -976,6 +975,8 @@ virDomainSnapshotRedefinePrep(virDomainObj *vm,
otherDomDef = otherSnapDef->parent.dom;
}
*snap = other;
if (virDomainSnapshotRedefineValidate(snapdef, vm->def->uuid, other, xmlopt, flags) < 0)
return -1;
@ -986,20 +987,5 @@ virDomainSnapshotRedefinePrep(virDomainObj *vm,
if (virDomainSnapshotAlignDisks(snapdef, otherDomDef, align_location, true) < 0)
return -1;
if (other) {
/* steal the domain definition if redefining an existing snapshot which
* with a snapshot definition lacking the domain definition */
if (!snapdef->parent.dom)
snapdef->parent.dom = g_steal_pointer(&otherSnapDef->parent.dom);
/* Drop and rebuild the parent relationship, but keep all
* child relations by reusing snap. */
virDomainMomentDropParent(other);
virObjectUnref(otherSnapDef);
other->def = &(*defptr)->parent;
*defptr = NULL;
*snap = other;
}
return 0;
}

2
src/conf/snapshot_conf.h
View File

@ -134,7 +134,7 @@ bool virDomainSnapshotDefIsExternal(virDomainSnapshotDef *def);
bool virDomainSnapshotIsExternal(virDomainMomentObj *snap);
int virDomainSnapshotRedefinePrep(virDomainObj *vm,
virDomainSnapshotDef **def,
virDomainSnapshotDef *snapdef,
virDomainMomentObj **snap,
virDomainXMLOption *xmlopt,
unsigned int flags);

19
src/conf/virdomainsnapshotobjlist.c
View File

@ -54,6 +54,25 @@ virDomainSnapshotAssignDef(virDomainSnapshotObjList *snapshots,
}
void
virDomainSnapshotReplaceDef(virDomainMomentObj *snap,
virDomainSnapshotDef **snapdefptr)
{
virDomainSnapshotDef *snapdef = *snapdefptr;
g_autoptr(virDomainSnapshotDef) origsnapdef = virDomainSnapshotObjGetDef(snap);
/* steal the domain definition if redefining an existing snapshot which
* with a snapshot definition lacking the domain definition */
if (!snapdef->parent.dom)
snapdef->parent.dom = g_steal_pointer(&origsnapdef->parent.dom);
/* Drop and rebuild the parent relationship, but keep all child relations by reusing snap. */
virDomainMomentDropParent(snap);
snap->def = &snapdef->parent;
*snapdefptr = NULL;
}
static bool
virDomainSnapshotFilter(virDomainMomentObj *obj,
unsigned int flags)

3
src/conf/virdomainsnapshotobjlist.h
View File

@ -32,6 +32,9 @@ void virDomainSnapshotObjListFree(virDomainSnapshotObjList *snapshots);
virDomainMomentObj *virDomainSnapshotAssignDef(virDomainSnapshotObjList *snapshots,
virDomainSnapshotDef **snapdefptr);
void virDomainSnapshotReplaceDef(virDomainMomentObj *snap,
virDomainSnapshotDef **snapdefptr);
int virDomainSnapshotObjListGetNames(virDomainSnapshotObjList *snapshots,
virDomainMomentObj *from,
char **const names, int maxnames,

1
src/libvirt_private.syms
View File

@ -1212,6 +1212,7 @@ virDomainSnapshotObjListNew;
virDomainSnapshotObjListNum;
virDomainSnapshotObjListRemove;
virDomainSnapshotObjListRemoveAll;
virDomainSnapshotReplaceDef;
virDomainSnapshotSetCurrent;
virDomainSnapshotUpdateRelations;

9
src/qemu/qemu_snapshot.c
View File

@ -1715,15 +1715,16 @@ qemuSnapshotRedefine(virDomainObj *vm,
virDomainSnapshotPtr ret = NULL;
g_autoptr(virDomainSnapshotDef) snapdef = virObjectRef(snapdeftmp);
if (virDomainSnapshotRedefinePrep(vm, &snapdef, &snap,
driver->xmlopt,
flags) < 0)
if (virDomainSnapshotRedefinePrep(vm, snapdef, &snap, driver->xmlopt, flags) < 0)
return NULL;
if (!snap) {
if (snap) {
virDomainSnapshotReplaceDef(snap, &snapdef);
} else {
if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, &snapdef)))
return NULL;
}
/* XXX Should we validate that the redefined snapshot even
* makes sense, such as checking that qemu-img recognizes the
* snapshot name in at least one of the domain's disks? */

6
src/test/test_driver.c
View File

@ -8749,10 +8749,12 @@ testDomainSnapshotRedefine(virDomainObj *vm,
virDomainMomentObj *snap = NULL;
g_autoptr(virDomainSnapshotDef) snapdef = virObjectRef(snapdeftmp);
if (virDomainSnapshotRedefinePrep(vm, &snapdef, &snap, xmlopt, flags) < 0)
if (virDomainSnapshotRedefinePrep(vm, snapdef, &snap, xmlopt, flags) < 0)
return NULL;
if (!snap) {
if (snap) {
virDomainSnapshotReplaceDef(snap, &snapdef);
} else {
if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, &snapdef)))
return NULL;
}