From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 11 May 2016 08:25:24 +0000 (+0200)
Subject: conf: Allow all volume modes for disk type='lun' sources
X-Git-Tag: v1.3.5-rc1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72475ac3b387574af2b1fd377a7206fd121ae3c6;p=thirdparty%2Flibvirt.git

conf: Allow all volume modes for disk type='lun' sources

Commit 82ba41108acd0f3f made possible to use direct mapped iSCSI
volumes in qemu as disk sources but didn't remove the define time check.

Rework the check by simplifying the condition and allow any volumes to
be used with disk type='lun'.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ed0c471465..b445469cfc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4145,26 +4145,18 @@ virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev,
             }
         }
 
-        /* Validate LUN configuration
-         * NOTE: virStorageTranslateDiskSourcePool is not run yet, so for
-         *       disk "volume"'s, the closest we can get at config time is
-         *       to ensure mode isn't direct since host/default will allow
-         *       lun/block usage. At run time if it's determined the wrong
-         *       voltype and pooltype values are set, then failure occurs
-         */
-        if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN &&
-            !(disk->src->type == VIR_STORAGE_TYPE_BLOCK ||
-              (disk->src->type == VIR_STORAGE_TYPE_NETWORK &&
-               disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) ||
-              (disk->src->type == VIR_STORAGE_TYPE_VOLUME &&
-               disk->src->srcpool &&
-               disk->src->srcpool->mode !=
-               VIR_STORAGE_SOURCE_POOL_MODE_DIRECT))) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("disk '%s' improperly configured for a "
-                             "device='lun'"),
-                           disk->dst);
-            return -1;
+        /* Validate LUN configuration */
+        if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
+            /* volumes haven't been translated at this point, so accept them */
+            if (!(disk->src->type == VIR_STORAGE_TYPE_BLOCK ||
+                  disk->src->type == VIR_STORAGE_TYPE_VOLUME ||
+                  (disk->src->type == VIR_STORAGE_TYPE_NETWORK &&
+                   disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI))) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("disk '%s' improperly configured for a "
+                                 "device='lun'"), disk->dst);
+                return -1;
+            }
         }
 
         if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&