]> xenbits.xensource.com Git - libvirt.git/commitdiff
virStorageSourceIsSameLocation: Use switch statement for individual storage types
authorPeter Krempa <pkrempa@redhat.com>
Fri, 7 Jan 2022 16:53:58 +0000 (17:53 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 6 Jan 2023 14:31:13 +0000 (15:31 +0100)
Convert to a switch instead of a bunch of 'if (type == ...).

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
src/conf/storage_source_conf.c

index 2b4cf5e241de8b460897065bdb9bbac390cd6b43..6ab9ed6ac518db9130fbd924cd78692161a3983a 100644 (file)
@@ -929,7 +929,8 @@ virStorageSourceIsSameLocation(virStorageSource *a,
         STRNEQ_NULLABLE(a->snapshot, b->snapshot))
         return false;
 
-    if (a->type == VIR_STORAGE_TYPE_NETWORK) {
+    switch (virStorageSourceGetActualType(a)) {
+    case VIR_STORAGE_TYPE_NETWORK:
         if (a->protocol != b->protocol ||
             a->nhosts != b->nhosts)
             return false;
@@ -941,11 +942,23 @@ virStorageSourceIsSameLocation(virStorageSource *a,
                 STRNEQ_NULLABLE(a->hosts[i].socket, b->hosts[i].socket))
                 return false;
         }
-    }
+        break;
 
-    if (a->type == VIR_STORAGE_TYPE_NVME &&
-        !virStorageSourceNVMeDefIsEqual(a->nvme, b->nvme))
-        return false;
+    case VIR_STORAGE_TYPE_NVME:
+        if (!virStorageSourceNVMeDefIsEqual(a->nvme, b->nvme))
+            return false;
+        break;
+
+    case VIR_STORAGE_TYPE_VHOST_USER:
+    case VIR_STORAGE_TYPE_NONE:
+    case VIR_STORAGE_TYPE_FILE:
+    case VIR_STORAGE_TYPE_BLOCK:
+    case VIR_STORAGE_TYPE_DIR:
+    case VIR_STORAGE_TYPE_LAST:
+    case VIR_STORAGE_TYPE_VOLUME:
+        /* nothing to do */
+        break;
+    }
 
     return true;
 }