qemuDomainDiskLookupByNodename: Simplify node name lookup

Use dummy variable to fill 'src' so that access to it doesn't need to be
conditionalized and use temporary variable for 'disk' rather than
dereferencing the array multiple times.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f14a15d3b4fad142ec5211027d29ab23c692c108..e4322aa2f6eed7061297e8a2f36a125b71ce5615 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9910,24 +9910,18 @@ qemuDomainDiskLookupByNodename(virDomainDefPtr def,
     size_t i;
     virStorageSourcePtr tmp = NULL;
 
-    if (src)
-        *src = NULL;
+    if (!src)
+        src = &tmp;
 
     for (i = 0; i < def->ndisks; i++) {
-        if ((tmp = virStorageSourceFindByNodeName(def->disks[i]->src, nodename))) {
-            if (src)
-                *src = tmp;
+        virDomainDiskDefPtr domdisk = def->disks[i];
 
-            return def->disks[i];
-        }
-
-        if (def->disks[i]->mirror &&
-            (tmp = virStorageSourceFindByNodeName(def->disks[i]->mirror, nodename))) {
-            if (src)
-                *src = tmp;
+        if ((*src = virStorageSourceFindByNodeName(domdisk->src, nodename)))
+            return domdisk;
 
-            return def->disks[i];
-        }
+        if (domdisk->mirror &&
+            (*src = virStorageSourceFindByNodeName(domdisk->mirror, nodename)))
+            return domdisk;
     }
 
     return NULL;