]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: domain: Remove code assuming disk format probing
authorPeter Krempa <pkrempa@redhat.com>
Tue, 10 Jul 2018 08:09:05 +0000 (10:09 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 10 Jul 2018 11:32:53 +0000 (13:32 +0200)
After commit c95f50cb021ea9a297 we always set a disk format in the
post parse callback so the code that mandates use of explicit format for
shareable disks no longer makes sense.

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

index 964fe9796374012421363813e3b56043ccfbce97..e29d01c828c1616aaf0b4102ac085b36a85cd1f3 100644 (file)
@@ -4642,20 +4642,12 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk,
     const char *driverName = virDomainDiskGetDriver(disk);
     virStorageSourcePtr n;
 
-    if (disk->src->shared && !disk->src->readonly) {
-        if (disk->src->format <= VIR_STORAGE_FILE_AUTO) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("shared access for disk '%s' requires use of "
-                             "explicitly specified disk format"), disk->dst);
-            return -1;
-        }
-
-        if (!qemuBlockStorageSourceSupportsConcurrentAccess(disk->src)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("shared access for disk '%s' requires use of "
-                             "supported storage format"), disk->dst);
-            return -1;
-        }
+    if (disk->src->shared && !disk->src->readonly &&
+        !qemuBlockStorageSourceSupportsConcurrentAccess(disk->src)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("shared access for disk '%s' requires use of "
+                         "supported storage format"), disk->dst);
+        return -1;
     }
 
     if (disk->geometry.cylinders > 0 &&