External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Drop pointless 'domain' argument from virDomainSnapshotRedefinePrep

Browse Source 
'vm' is passed in which contains the definition which contains the UUID
so we don't need another parameter for this.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-09-20 12:25:51 +02:00
parent 4c94f8d8c1
commit efeb6232c6
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/snapshot_conf.c
View File

@ -986,8 +986,7 @@ virDomainSnapshotIsExternal(virDomainMomentObjPtr snap)
}
int
virDomainSnapshotRedefinePrep(virDomainPtr domain,
virDomainObjPtr vm,
virDomainSnapshotRedefinePrep(virDomainObjPtr vm,
virDomainSnapshotDefPtr *defptr,
virDomainMomentObjPtr *snap,
virDomainXMLOptionPtr xmlopt,
@ -1006,7 +1005,7 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain,
if (other)
otherdef = virDomainSnapshotObjGetDef(other);
check_if_stolen = other && otherdef->parent.dom;
if (virDomainSnapshotRedefineValidate(def, domain->uuid, other, xmlopt,
if (virDomainSnapshotRedefineValidate(def, vm->def->uuid, other, xmlopt,
flags) < 0) {
/* revert any stealing of the snapshot domain definition */
if (check_if_stolen && def->parent.dom && !otherdef->parent.dom)

3
src/conf/snapshot_conf.h
View File

@ -129,8 +129,7 @@ int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot,
bool virDomainSnapshotDefIsExternal(virDomainSnapshotDefPtr def);
bool virDomainSnapshotIsExternal(virDomainMomentObjPtr snap);
int virDomainSnapshotRedefinePrep(virDomainPtr domain,
virDomainObjPtr vm,
int virDomainSnapshotRedefinePrep(virDomainObjPtr vm,
virDomainSnapshotDefPtr *def,
virDomainMomentObjPtr *snap,
virDomainXMLOptionPtr xmlopt,

2
src/qemu/qemu_driver.c
View File

@ -15969,7 +15969,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE);
if (redefine) {
if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap,
if (virDomainSnapshotRedefinePrep(vm, &def, &snap,
driver->xmlopt,
&update_current, flags) < 0)
goto endjob;

2
src/test/test_driver.c
View File

@ -8612,7 +8612,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
goto cleanup;
if (redefine) {
if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap,
if (virDomainSnapshotRedefinePrep(vm, &def, &snap,
privconn->xmlopt,
&update_current, flags) < 0)
goto cleanup;