Signed-off-by: Jeff Cody <jc...@redhat.com>
---
qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 5f82d35..08a1419 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2111,6 +2111,7 @@
# @replication: Since 2.8
# @ssh: Since 2.8
# @iscsi: Since 2.9
+# @rbd: Since 2.9
#
# Since: 2.0
##
@@ -2120,7 +2121,7 @@
'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk',
- 'vpc', 'vvfat' ] }
+ 'vpc', 'vvfat', 'rbd' ] }
##
# @BlockdevOptionsFile:
@@ -2376,7 +2377,6 @@
'path': 'str',
'*user': 'str' } }
-
##
# @BlkdebugEvent:
#
@@ -2666,6 +2666,47 @@
'*timeout': 'int' } }
##
+# @BlockdevOptionsRbd:
+#
+# @pool: Ceph pool name
+#
+# @image: Image name in the Ceph pool
+#
+# @conf: # optional path to Ceph configuration file. Values
+# in the configuration file will be overridden by
+# options specified via QAPI.
+#
+# @snapshot: #optional Ceph snapshot name
+#
+# @rbd-id: #optional Ceph id name
+#
+# @password-secret: #optional The ID of a QCryptoSecret object providing
+# the password for the login.
+#
+# @keyvalue-pairs: #optional string containing key/value pairs for
+# additional Ceph configuration, not including "id" or
"conf"
+# options. This can be used to specify any of the options
+# that Ceph supports. The format is of the form:
+# key1=value1:key2=value2:[...]
+#
+# Special characters such as ":" and "=" can be escaped
+# with a '\' character, which means the QAPI needs an
+# extra '\' character to pass the needed escape character.
+# For example:
+# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321"
+#
+# Since: 2.9
+##
+{ 'struct': 'BlockdevOptionsRbd',
+ 'data': { 'pool': 'str',
+ 'image': 'str',
+ '*conf': 'str',
+ '*snapshot': 'str',
+ '*rbd-id': 'str',
+ '*password-secret': 'str',
+ '*keyvalue-pairs': 'str' } }
+
+##
# @ReplicationMode:
#
# An enumeration of replication modes.
@@ -2863,7 +2904,7 @@
'qed': 'BlockdevOptionsGenericCOWFormat',
'quorum': 'BlockdevOptionsQuorum',
'raw': 'BlockdevOptionsRaw',
-# TODO rbd: Wait for structured options
+ 'rbd': 'BlockdevOptionsRbd',
'replication':'BlockdevOptionsReplication',
# TODO sheepdog: Wait for structured options
'ssh': 'BlockdevOptionsSsh',
--
2.9.3
