shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00
Code Releases Activity

conf: Drop pointless 'domain' argument from virDomainCheckpointRedefinePrep

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 75f4a7b2c7
commit 4c94f8d8c1
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/checkpoint_conf.c
View File

@ -532,8 +532,7 @@ virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def,
int
virDomainCheckpointRedefinePrep(virDomainPtr domain,
virDomainObjPtr vm,
virDomainCheckpointRedefinePrep(virDomainObjPtr vm,
virDomainCheckpointDefPtr *defptr,
virDomainMomentObjPtr *chk,
virDomainXMLOptionPtr xmlopt,
@ -544,13 +543,13 @@ virDomainCheckpointRedefinePrep(virDomainPtr domain,
virDomainMomentObjPtr other = NULL;
virDomainCheckpointDefPtr otherdef = NULL;
virUUIDFormat(domain->uuid, uuidstr);
virUUIDFormat(vm->def->uuid, uuidstr);
if (virDomainCheckpointCheckCycles(vm->checkpoints, def, vm->def->name) < 0)
return -1;
if (!def->parent.dom ||
memcmp(def->parent.dom->uuid, domain->uuid, VIR_UUID_BUFLEN)) {
memcmp(def->parent.dom->uuid, vm->def->uuid, VIR_UUID_BUFLEN)) {
virReportError(VIR_ERR_INVALID_ARG,
_("definition for checkpoint %s must use uuid %s"),
def->parent.name, uuidstr);

3
src/conf/checkpoint_conf.h
View File

@ -90,8 +90,7 @@ virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def,
int
virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr checkpoint);
int virDomainCheckpointRedefinePrep(virDomainPtr domain,
virDomainObjPtr vm,
int virDomainCheckpointRedefinePrep(virDomainObjPtr vm,
virDomainCheckpointDefPtr *def,
virDomainMomentObjPtr *checkpoint,
virDomainXMLOptionPtr xmlopt,

2
src/qemu/qemu_driver.c
View File

@ -17291,7 +17291,7 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain,
goto cleanup;
if (redefine) {
if (virDomainCheckpointRedefinePrep(domain, vm, &def, &chk,
if (virDomainCheckpointRedefinePrep(vm, &def, &chk,
driver->xmlopt,
&update_current) < 0)
goto endjob;

2
src/test/test_driver.c
View File

@ -9073,7 +9073,7 @@ testDomainCheckpointCreateXML(virDomainPtr domain,
goto cleanup;
if (redefine) {
if (virDomainCheckpointRedefinePrep(domain, vm, &def, &chk,
if (virDomainCheckpointRedefinePrep(vm, &def, &chk,
privconn->xmlopt,
&update_current) < 0)
goto cleanup;