conf: introduce initiator IQN support for domain disks

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 5887939bd0a4a9f4a696832f943622bc59980205..34664f79033df8e4c191b62cac61d62b85de1b1a 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2733,6 +2733,17 @@
     </source>
     <target dev='sdb' bus='scsi'/>
   </disk>
+  </disk>
+  <disk type='network' device='lun'>
+    <driver name='qemu' type='raw'/>
+    <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'>
+      <host name='example.com' port='3260'/>
+      <initiator>
+        <iqn name='iqn.2013-07.com.example:client'/>
+      </initiator>
+    </source>
+    <target dev='sdb' bus='scsi'/>
+  </disk>
   <disk type='volume' device='disk'>
     <driver name='qemu' type='raw'/>
     <source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/>
@@ -3090,6 +3101,15 @@
             It's recommended to allow libvirt manage the persistent
             reservations.
           </dd>
+          <dt><code>initiator</code></dt>
+          <dd><span class="since">Since libvirt 4.7.0</span>, the
+            <code>initiator</code> element is supported for a disk
+            <code>type</code> "network" that is using a <code>source</code>
+            element with the <code>protocol</code> attribute "iscsi".
+            If present, the <code>initiator</code> element provides the
+            initiator IQN needed to access the source via mandatory
+            attribute <code>name</code>.
+          </dd>
         </dl>
 
         <p>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index ac04af51a18c13d54bc4602ab07615bcbd6404f2..1a786968ccebfce39c068662aab2f7bc87ea06bd 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1699,6 +1699,9 @@
       <optional>
         <ref name="encryption"/>
       </optional>
+      <optional>
+        <ref name="initiatorinfo"/>
+      </optional>
     </element>
   </define>
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b6035d45abe7b2a9468f75af0c4d62ce73250560..8fd774b531a2e4fbd570cf1df257f02f6f71e08e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8853,6 +8853,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
 
     virStorageSourceNetworkAssignDefaultPorts(src);
 
+    virStorageSourceInitiatorParseXML(ctxt, &src->initiator);
+
     ret = 0;
 
  cleanup:
@@ -23568,6 +23570,8 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
     virBufferEscapeString(childBuf, "<snapshot name='%s'/>\n", src->snapshot);
     virBufferEscapeString(childBuf, "<config file='%s'/>\n", src->configFile);
 
+    virStorageSourceInitiatorFormatXML(&src->initiator, childBuf);
+
     return 0;
 }
 
@@ -30194,6 +30198,12 @@ virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
     if (virDomainDiskAddISCSIPoolSourceHost(def, pooldef) < 0)
         return -1;
 
+    if (!def->src->initiator.iqn && pooldef->source.initiator.iqn &&
+        virStorageSourceInitiatorCopy(&def->src->initiator,
+                                      &pooldef->source.initiator) < 0) {
+        return -1;
+    }
+
     return 0;
 }
 

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index fb79ceddd098b0ff51063295dab0391d5bdfdfbe..6939d0d6c90bcc37cfec73c75c92fe8b2c658859 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2272,6 +2272,9 @@ virStorageSourceCopy(const virStorageSource *src,
         !(ret->pr = virStoragePRDefCopy(src->pr)))
         goto error;
 
+    if (virStorageSourceInitiatorCopy(&ret->initiator, &src->initiator))
+        goto error;
+
     if (backingChain && src->backingStore) {
         if (!(ret->backingStore = virStorageSourceCopy(src->backingStore,
                                                        true)))
@@ -2503,6 +2506,8 @@ virStorageSourceClear(virStorageSourcePtr def)
     VIR_FREE(def->tlsAlias);
     VIR_FREE(def->tlsCertdir);
 
+    virStorageSourceInitiatorClear(&def->initiator);
+
     memset(def, 0, sizeof(*def));
 }
 

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index b6013431cc3fadc7e899aa875baa790c18853fc9..3ff6c4f9008edb8ec994bc9217274045939f636f 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -261,6 +261,8 @@ struct _virStorageSource {
     bool encryptionInherited;
     virStoragePRDefPtr pr;
 
+    virStorageSourceInitiatorDef initiator;
+
     virObjectPtr privateData;
 
     int format; /* virStorageFileFormat in domain backing chains, but