Commit 8a47e8eb authored by Jeff Cody's avatar Jeff Cody
Browse files

block/rbd: add blockdev-add support 



Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent c7cacb3e

qapi/block-core.json

+31 −2
Original line number Diff line number Diff line
@@ -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' ] }



##
@@ -2665,6 +2666,34 @@ 
            '*header-digest': 'IscsiHeaderDigest',

            '*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:

#
@@ -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',