qemu: Get capabilities to use iscsi password-secret argument

Detect the capability via the query-qmp-schema for blockdev-add
to find the 'password-secret' parameter that will allow the iSCSI
code to use the master secret object to encrypt the secret for an
and only need to provide the object id of the secret on the command
line thus obsfuscating the passphrase.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 201e83c45cf5d5fcc771f1f0d426ce36ad4a76c4..f2d24a30994fd6bcd177ad6a760c43f12b2e26e9 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -451,6 +451,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "sclplmconsole",
               "numa.dist",
               "disk-share-rw",
+              "iscsi.password-secret",
     );
 
 
@@ -1809,6 +1810,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
     { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
     { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
+    { "blockdev-add/arg-type/+iscsi/password-secret", QEMU_CAPS_ISCSI_PASSWORD_SECRET },
 };
 
 struct virQEMUCapsObjectTypeProps {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b29d6f14d67b53bcd875f92e4296fd06fdbf94ce..68a2541d30e6edd9e4a219c1535aee88e56b8505 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -437,6 +437,7 @@ typedef enum {
     QEMU_CAPS_DEVICE_SCLPLMCONSOLE, /* -device sclplmconsole */
     QEMU_CAPS_NUMA_DIST, /* -numa dist */
     QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */
+    QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
index 78fa7562a1f9920fcadfdc8ed4d4ac13d6658cdf..96b42bbe91dcbc167a32da0b76797364fe194f53 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
@@ -182,6 +182,7 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
index 8f2dba6232ef43c97431f623ac180f1676fbdab2..79866a0259d711de1230bdf280c67a28bfb215b9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
@@ -182,6 +182,7 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index cde5ea0e33e5a7ff71c3bff8fc704e122eddcc3e..5f97bc3932e6fa3b6c86d485b50f62ceaf436a27 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -181,6 +181,7 @@
   <flag name='spapr-vty'/>
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 00fe1cffa7cfdcf7e155c60e366ce8c4dd99f134..64e70f54be1a185331c87ce22c101d52944a613e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -144,6 +144,7 @@
   <flag name='sclplmconsole'/>
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index dd04855be34b64c18ce3ef1229f87d1fe1fc22a1..ec7f29cc1cebe24fe5b1a4613931188fcdaafbf2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -226,6 +226,7 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 3b70b1a4076fd8d2d47e03cbdd49933b64684872..4e712f69ebfc317b342b5e85a6c1cef90d36d6f5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -175,6 +175,7 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='spapr-vty'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.9.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 5c4a02c8b158f37cc76cdb81da702a7cf1f5cdcb..baac0b7aeb272fb1de425f22c975d330d94b9f09 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -140,6 +140,7 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='sclplmconsole'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 0ea9a2fce394a7e8bd4132b53a2e491d0d27dd32..4e8079d8fd4e8079921842a52c4b04516d4961c9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -222,6 +222,7 @@
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='virtio-blk.num-queues'/>
   <flag name='disk-share-rw'/>
+  <flag name='iscsi.password-secret'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.9.0)</package>