[PATCH 1/9] qemu: domain: Remove code assuming disk format probing

[Peter Krempa <pkrempa@xxxxxxxxxx>]

After commit c95f50cb021ea9a297 we always set a disk format in the
post parse callback so the code that madates use of explicit format for
shareable disks no longer makes sense.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_domain.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 964fe97963..e29d01c828 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -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 &&
-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list