diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index f149ff9c67..25aab39675 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -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;
 }