aboutsummaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2017-02-27 01:16:41 -0500
committerJeff Cody <jcody@redhat.com>2017-02-28 11:32:40 -0500
commit8a47e8eb592b30b010fe143eb2393d4033f0a79c (patch)
tree18c75c00c6474c585d23c13e88c4929eba7b4546 /qapi
parentc7cacb3e7a2e9fdf929c993b98268e4179147cbb (diff)
downloadqemu-8a47e8eb592b30b010fe143eb2393d4033f0a79c.zip
qemu-8a47e8eb592b30b010fe143eb2393d4033f0a79c.tar.gz
qemu-8a47e8eb592b30b010fe143eb2393d4033f0a79c.tar.bz2
block/rbd: add blockdev-add support
Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Jeff Cody <jcody@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/block-core.json33
1 files changed, 31 insertions, 2 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index cf24c04..803edc3 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
##
@@ -2119,7 +2120,7 @@
'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
- 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk',
+ 'quorum', 'raw', 'rbd', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk',
'vpc', 'vvfat' ] }
##
@@ -2666,6 +2667,34 @@
'*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.
+#
+# @user: #optional Ceph id name.
+#
+# @password-secret: #optional The ID of a QCryptoSecret object providing
+# the password for the login.
+#
+# Since: 2.9
+##
+{ 'struct': 'BlockdevOptionsRbd',
+ 'data': { 'pool': 'str',
+ 'image': 'str',
+ '*conf': 'str',
+ '*snapshot': 'str',
+ '*user': 'str',
+ '*password-secret': 'str' } }
+
+##
# @ReplicationMode:
#
# An enumeration of replication modes.
@@ -2863,7 +2892,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',