diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index b1c3bfca3eecbbfdb3e47bf2b304af48a728f8c0..7601aaaf546df6ff34b563e6d3a5d20bbe3b3e46 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1601,7 +1601,16 @@
pool and volume. Attribute pool
specifies the name of storage pool (managed by libvirt) where the disk
source resides, and attribute volume specifies the name of
- storage volume (managed by libvirt) used as the disk source.
+ storage volume (managed by libvirt) used as the disk source. For a
+ "volume" type disk, if the underlying storage pool is "iscsi", attribute
+ mode (since 1.1.1) can be used
+ to indicate how to represent the LUN as the disk source. The value
+ "host" indicates to use the LUN's path as it shows up on host, e.g.
+ /dev/disk/by-path/ip-10.11.12.9:3260-iscsi-iqn.2013-06.fc:iscsi.iscsi0-lun-1).
+ The value "direct" indicates to use the storage pool's
+ source element host attribute as the
+ disk source for the libiscsi URI, e.g.
+ file=iscsi://demo.org:6000/iqn.1992-01.com.example/1.
Since 0.0.3; type='dir' since
0.7.5; type='network' since
0.8.7; protocol='iscsi' since 1.0.4;
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7a6852b3779401f04c01cc5f591748b1bc629e24..745b959a8f09f43f1abe40e9cc2681a539c7183a 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1173,6 +1173,14 @@
+
+
+
+ host
+ direct
+
+
+
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 308a96beef586999196d0738c3cddeb0694d541e..297553c23af20a7d0ee7c29d09aeeeb35b628178 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -761,6 +761,11 @@ VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST,
"default",
"unmap",
"ignore")
+VIR_ENUM_IMPL(virDomainDiskSourcePoolMode,
+ VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST,
+ "default",
+ "host",
+ "direct")
#define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE
#define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE
@@ -4645,10 +4650,12 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node,
{
char *pool = NULL;
char *volume = NULL;
+ char *mode = NULL;
int ret = -1;
pool = virXMLPropString(node, "pool");
volume = virXMLPropString(node, "volume");
+ mode = virXMLPropString(node, "mode");
/* CD-ROM and Floppy allows no source */
if (!pool && !volume)
@@ -4664,6 +4671,14 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node,
if (VIR_ALLOC(def->srcpool) < 0)
goto cleanup;
+ if (mode && (def->srcpool->mode =
+ virDomainDiskSourcePoolModeTypeFromString(mode)) <= 0) {
+ virReportError(VIR_ERR_XML_ERROR,
+ _("unknown source mode '%s' for volume type disk"),
+ mode);
+ goto cleanup;
+ }
+
def->srcpool->pool = pool;
pool = NULL;
def->srcpool->volume = volume;
@@ -4674,6 +4689,7 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node,
cleanup:
VIR_FREE(pool);
VIR_FREE(volume);
+ VIR_FREE(mode);
return ret;
}
@@ -14157,9 +14173,13 @@ virDomainDiskSourceDefFormat(virBufferPtr buf,
case VIR_DOMAIN_DISK_TYPE_VOLUME:
virBufferAddLit(buf, " srcpool)
+ if (def->srcpool) {
virBufferAsprintf(buf, " pool='%s' volume='%s'",
def->srcpool->pool, def->srcpool->volume);
+ if (def->srcpool->mode)
+ virBufferAsprintf(buf, " mode='%s'",
+ virDomainDiskSourcePoolModeTypeToString(def->srcpool->mode));
+ }
if (def->startupPolicy)
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 00d3c3a4ab3a6574408330afececcd13d2e587ca..900fb01f056fd82ce677fbd2b829224be6a063b3 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -652,11 +652,32 @@ struct _virDomainBlockIoTuneInfo {
};
typedef virDomainBlockIoTuneInfo *virDomainBlockIoTuneInfoPtr;
+/*
+ * Used for volume "type" disk to indicate how to represent
+ * the disk source if the specified "pool" is of iscsi type.
+ */
+enum virDomainDiskSourcePoolMode {
+ VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT = 0,
+
+ /* Use the path as it shows up on host, e.g.
+ * /dev/disk/by-path/ip-$ip-iscsi-$iqn:iscsi.iscsi-pool0-lun-1
+ */
+ VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST,
+
+ /* Use the URI from the storage pool source element host attribute. E.g.
+ * file=iscsi://demo.org:6000/iqn.1992-01.com.example/1.
+ */
+ VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT,
+
+ VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST
+};
+
typedef struct _virDomainDiskSourcePoolDef virDomainDiskSourcePoolDef;
struct _virDomainDiskSourcePoolDef {
char *pool; /* pool name */
char *volume; /* volume name */
int voltype; /* enum virStorageVolType, internal only */
+ int mode; /* enum virDomainDiskSourcePoolMode */
};
typedef virDomainDiskSourcePoolDef *virDomainDiskSourcePoolDefPtr;
@@ -2554,6 +2575,7 @@ VIR_ENUM_DECL(virDomainDiskSecretType)
VIR_ENUM_DECL(virDomainDeviceSGIO)
VIR_ENUM_DECL(virDomainDiskTray)
VIR_ENUM_DECL(virDomainDiskDiscard)
+VIR_ENUM_DECL(virDomainDiskSourcePoolMode)
VIR_ENUM_DECL(virDomainIoEventFd)
VIR_ENUM_DECL(virDomainVirtioEventIdx)
VIR_ENUM_DECL(virDomainDiskCopyOnRead)
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b907633b96e6c03b52fe24e3c059410da19c3d1f
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
@@ -0,0 +1,48 @@
+
+ QEMUGuest1
+ c7a5fdbd-edaf-9455-926a-d65c16db1809
+ 219136
+ 219136
+ 1
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 76570c5c9560ed6ea5b554caea03062c8eee478a..77cac3f68733c22340cd354d231f542c81f4ebc6 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -264,6 +264,7 @@ mymain(void)
DO_TEST("disk-scsi-disk-vpd");
DO_TEST("disk-source-pool");
+ DO_TEST("disk-source-pool-mode");
DO_TEST("disk-drive-discard");