diff mbox

[v4,9/9] qapi: Add NVMe driver options to the schema

Message ID 20180110091846.10699-10-famz@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fam Zheng Jan. 10, 2018, 9:18 a.m. UTC 
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 qapi/block-core.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

Comments

Eric Blake Jan. 10, 2018, 2:41 p.m. UTC | #1 
On 01/10/2018 03:18 AM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  qapi/block-core.json | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index e94a6881b2..fd6c94454d 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -2237,7 +2237,7 @@
>    'data': [ 'blkdebug', 'blkverify', 'bochs', 'cloop',
>              'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
>              'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
> -            'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
> +            'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', 'qcow2', 'qed',
>              'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
>              'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }

Missing a doc line:
@nvme: Since 2.12
Stefan Hajnoczi Jan. 10, 2018, 7:06 p.m. UTC | #2 
On Wed, Jan 10, 2018 at 05:18:46PM +0800, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  qapi/block-core.json | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Fam Zheng Jan. 12, 2018, 3:12 a.m. UTC | #3 
On Wed, 01/10 08:41, Eric Blake wrote:
> On 01/10/2018 03:18 AM, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  qapi/block-core.json | 16 +++++++++++++++-
> >  1 file changed, 15 insertions(+), 1 deletion(-)
> > 
> > diff --git a/qapi/block-core.json b/qapi/block-core.json
> > index e94a6881b2..fd6c94454d 100644
> > --- a/qapi/block-core.json
> > +++ b/qapi/block-core.json
> > @@ -2237,7 +2237,7 @@
> >    'data': [ 'blkdebug', 'blkverify', 'bochs', 'cloop',
> >              'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
> >              'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
> > -            'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
> > +            'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', 'qcow2', 'qed',
> >              'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
> >              'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
> 
> Missing a doc line:
> @nvme: Since 2.12
> 

Will add, thanks!

Fam
diff mbox

Patch

diff --git a/qapi/block-core.json b/qapi/block-core.json
index e94a6881b2..fd6c94454d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2237,7 +2237,7 @@ 
   'data': [ 'blkdebug', 'blkverify', 'bochs', 'cloop',
             'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
             'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
-            'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
+            'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', 'qcow2', 'qed',
             'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
             'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 
@@ -2278,6 +2278,19 @@ 
 { 'struct': 'BlockdevOptionsNull',
   'data': { '*size': 'int', '*latency-ns': 'uint64' } }
 
+##
+# @BlockdevOptionsNVMe:
+#
+# Driver specific block device options for the NVMe backend.
+#
+# @device:    controller address of the NVMe device.
+# @namespace: namespace number of the device, starting from 1.
+#
+# Since: 2.12
+##
+{ 'struct': 'BlockdevOptionsNVMe',
+  'data': { 'device': 'str', 'namespace': 'int' } }
+
 ##
 # @BlockdevOptionsVVFAT:
 #
@@ -3183,6 +3196,7 @@ 
       'nfs':        'BlockdevOptionsNfs',
       'null-aio':   'BlockdevOptionsNull',
       'null-co':    'BlockdevOptionsNull',
+      'nvme':       'BlockdevOptionsNVMe',
       'parallels':  'BlockdevOptionsGenericFormat',
       'qcow2':      'BlockdevOptionsQcow2',
       'qcow':       'BlockdevOptionsQcow',