]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuDomainDeviceDefValidateDisk: Reorder some checks
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 5 Jun 2019 11:45:35 +0000 (13:45 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 6 Aug 2019 09:20:35 +0000 (11:20 +0200)
I find this function more readable if checks for passed storage
source are done first and backing chain is done last. Mixing them
together does not hurt, but is less readable.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
ACKed-by: Peter Krempa <pkrempa@redhat.com>
src/qemu/qemu_domain.c

index fce307728bd3a6cc57edbb4bb27a072ddfa84bdb..c45eadf4bed134a57dd6e46736cf7df8793da212 100644 (file)
@@ -5524,11 +5524,6 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk,
         return -1;
     }
 
-    for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
-        if (qemuDomainValidateStorageSource(n, qemuCaps) < 0)
-            return -1;
-    }
-
     if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
         disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -5537,6 +5532,11 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk,
         return -1;
     }
 
+    for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
+        if (qemuDomainValidateStorageSource(n, qemuCaps) < 0)
+            return -1;
+    }
+
     return 0;
 }