Add missing image, config_path options to QEMU QAPI

allow-etcd-address-option
Vitaliy Filippov 2021-07-08 01:08:27 +03:00
parent b52dd6843a
commit bb31050ab5
4 changed files with 40 additions and 24 deletions

View File

@ -11,7 +11,7 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
'qcow2', 'qed', 'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', 'replication', 'sheepdog',
@@ -3367,6 +3367,24 @@ @@ -3367,6 +3367,28 @@
'*tag': 'str' } } '*tag': 'str' } }
## ##
@ -19,17 +19,21 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
+# +#
+# Driver specific block device options for vitastor +# Driver specific block device options for vitastor
+# +#
+# @image: Image name
+# @inode: Inode number +# @inode: Inode number
+# @pool: Pool ID +# @pool: Pool ID
+# @size: Desired image size in bytes +# @size: Desired image size in bytes
+# @etcd_host: etcd connection address +# @config_path: Path to Vitastor configuration
+# @etcd_host: etcd connection address(es)
+# @etcd_prefix: etcd key/value prefix +# @etcd_prefix: etcd key/value prefix
+## +##
+{ 'struct': 'BlockdevOptionsVitastor', +{ 'struct': 'BlockdevOptionsVitastor',
+ 'data': { 'inode': 'uint64', + 'data': { '*inode': 'uint64',
+ 'pool': 'uint64', + '*pool': 'uint64',
+ 'size': 'uint64', + '*size': 'uint64',
+ 'etcd_host': 'str', + '*image': 'str',
+ '*config_path': 'str',
+ '*etcd_host': 'str',
+ '*etcd_prefix': 'str' } } + '*etcd_prefix': 'str' } }
+ +
+## +##

View File

@ -11,7 +11,7 @@ Index: qemu/qapi/block-core.json
'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
## ##
@@ -3725,6 +3725,24 @@ @@ -3725,6 +3725,28 @@
'*tag': 'str' } } '*tag': 'str' } }
## ##
@ -19,17 +19,21 @@ Index: qemu/qapi/block-core.json
+# +#
+# Driver specific block device options for vitastor +# Driver specific block device options for vitastor
+# +#
+# @image: Image name
+# @inode: Inode number +# @inode: Inode number
+# @pool: Pool ID +# @pool: Pool ID
+# @size: Desired image size in bytes +# @size: Desired image size in bytes
+# @etcd_host: etcd connection address +# @config_path: Path to Vitastor configuration
+# @etcd_host: etcd connection address(es)
+# @etcd_prefix: etcd key/value prefix +# @etcd_prefix: etcd key/value prefix
+## +##
+{ 'struct': 'BlockdevOptionsVitastor', +{ 'struct': 'BlockdevOptionsVitastor',
+ 'data': { 'inode': 'uint64', + 'data': { '*inode': 'uint64',
+ 'pool': 'uint64', + '*pool': 'uint64',
+ 'size': 'uint64', + '*size': 'uint64',
+ 'etcd_host': 'str', + '*image': 'str',
+ '*config_path': 'str',
+ '*etcd_host': 'str',
+ '*etcd_prefix': 'str' } } + '*etcd_prefix': 'str' } }
+ +
+## +##

View File

@ -11,7 +11,7 @@ Index: qemu/qapi/block-core.json
'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
## ##
@@ -3635,6 +3635,24 @@ @@ -3635,6 +3635,28 @@
'*tag': 'str' } } '*tag': 'str' } }
## ##
@ -19,17 +19,21 @@ Index: qemu/qapi/block-core.json
+# +#
+# Driver specific block device options for vitastor +# Driver specific block device options for vitastor
+# +#
+# @image: Image name
+# @inode: Inode number +# @inode: Inode number
+# @pool: Pool ID +# @pool: Pool ID
+# @size: Desired image size in bytes +# @size: Desired image size in bytes
+# @etcd_host: etcd connection address +# @config_path: Path to Vitastor configuration
+# @etcd_host: etcd connection address(es)
+# @etcd_prefix: etcd key/value prefix +# @etcd_prefix: etcd key/value prefix
+## +##
+{ 'struct': 'BlockdevOptionsVitastor', +{ 'struct': 'BlockdevOptionsVitastor',
+ 'data': { 'inode': 'uint64', + 'data': { '*inode': 'uint64',
+ 'pool': 'uint64', + '*pool': 'uint64',
+ 'size': 'uint64', + '*size': 'uint64',
+ 'etcd_host': 'str', + '*image': 'str',
+ '*config_path': 'str',
+ '*etcd_host': 'str',
+ '*etcd_prefix': 'str' } } + '*etcd_prefix': 'str' } }
+ +
+## +##

View File

@ -11,7 +11,7 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
## ##
@@ -3644,6 +3644,24 @@ @@ -3644,6 +3644,28 @@
'*tag': 'str' } } '*tag': 'str' } }
## ##
@ -19,17 +19,21 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
+# +#
+# Driver specific block device options for vitastor +# Driver specific block device options for vitastor
+# +#
+# @image: Image name
+# @inode: Inode number +# @inode: Inode number
+# @pool: Pool ID +# @pool: Pool ID
+# @size: Desired image size in bytes +# @size: Desired image size in bytes
+# @etcd_host: etcd connection address +# @config_path: Path to Vitastor configuration
+# @etcd_host: etcd connection address(es)
+# @etcd_prefix: etcd key/value prefix +# @etcd_prefix: etcd key/value prefix
+## +##
+{ 'struct': 'BlockdevOptionsVitastor', +{ 'struct': 'BlockdevOptionsVitastor',
+ 'data': { 'inode': 'uint64', + 'data': { '*inode': 'uint64',
+ 'pool': 'uint64', + '*pool': 'uint64',
+ 'size': 'uint64', + '*size': 'uint64',
+ 'etcd_host': 'str', + '*image': 'str',
+ '*config_path': 'str',
+ '*etcd_host': 'str',
+ '*etcd_prefix': 'str' } } + '*etcd_prefix': 'str' } }
+ +
+## +##