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

Remove useless variable in qemuDomainAssignAddresses

Browse Source 
We do not need to propagate the exact return values
and the only possible ones are 0 and -1 anyway.

Remove the temporary variable and use the usual pattern:

if (f() < 0)
    return -1;
This commit is contained in:
Ján Tomko 2016-04-28 15:35:41 +02:00
parent 7c6733a234
commit 2d61934a21
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_domain_address.c
View File

@ -1644,23 +1644,21 @@ qemuDomainAssignAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj)
{
int rc;
if (qemuDomainAssignVirtioSerialAddresses(def, obj) < 0)
return -1;
rc = qemuDomainAssignVirtioSerialAddresses(def, obj);
if (rc)
return rc;
if (qemuDomainAssignSpaprVIOAddresses(def, qemuCaps) < 0)
return -1;
rc = qemuDomainAssignSpaprVIOAddresses(def, qemuCaps);
if (rc)
return rc;
rc = qemuDomainAssignS390Addresses(def, qemuCaps, obj);
if (rc)
return rc;
if (qemuDomainAssignS390Addresses(def, qemuCaps, obj) < 0)
return -1;
qemuDomainAssignARMVirtioMMIOAddresses(def, qemuCaps);
return qemuDomainAssignPCIAddresses(def, qemuCaps, obj);
if (qemuDomainAssignPCIAddresses(def, qemuCaps, obj) < 0)
return -1;
return 0;
}