Merging upstream version 2.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

completions/_nvme

@@ -9,8 +9,9 @@ _nvme () {
 	_cmds=(
 	'id-ctrl:display information about the controller'
 	'id-ns:display information about the namespace'
+	'id-ns-lba-format:display information about the namespace capability fields for specific LBA format'
 	'list-ns:identify all namespace(s) attached'
-	'cmdset-ind-id-ns':display I/O Command Set Independent information about the namespace'
+	'cmdset-ind-id-ns:display I/O Command Set Independent information about the namespace'
 	'id-iocs:display information about I/O command sets'
 	'id-domain:display information about domain list'
 	'create-ns:create a new namespace before attachment'
@@ -19,6 +20,8 @@ _nvme () {
 	'detach-ns:detach namespace from controller'
 	'list-ctrl:identify all controller(s) attached'
 	'nvm-id-ctrl:display information about the nvm command set'
+	'nvm-id-ns:display information about the namespace of nvm command set'
+	'id-ns-lba-format:display information about the namespace of nvm command set capability fields for specific LBA format'
 	'list-endgrp:display information about nvme endurance group list'
 	'get-ns-id:get namespace id of opened block device'
 	'get-log:retrieve any log in raw format'
@@ -56,6 +59,8 @@ _nvme () {
 	'fid-support-effects-log:retrieve fid support and effects log'
 	'supported-log-pages: retrieve support log pages details'
 	'lockdown:submit a lockdown command'
+	'media-unit-stat-log: retrieve media unit status log pages details'
+	'supported-cap-config-log: retrieve support log pages details'
 	'help:print brief descriptions of all nvme commands'
 	)
 
@@ -99,6 +104,22 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme id-ns options" _idns
 			;;
+		(id-ns-lba-format)
+			local _idns_lba_format
+			_idns_lba_format=(
+			/dev/nvme':supply a device to use (required)'
+			--lba-format-index=':show infos for lba format index <lba-format-index>'
+			-i':alias of --lba-format-index'
+			--uuid-index=':uuid index'
+			-U':alias for --uuid-index'
+			--output-format=':Output format: normal|json|binary'
+			-o':alias for --output-format'
+			--verbose':show infos verbosely'
+			-v':alias of --verbose'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme id-ns-lba-format options" _idns_lba_format
+			;;
 		(list-ns)
 			local _listns
 			_listns=(
@@ -145,7 +166,7 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme id-domain options" _iddomain
 			;;
-		nvm-id-ctrl)
+		(nvm-id-ctrl)
 			local _nvmidctrl
 			_nvmidctrl=(
 			/dev/nvme':supply a device to use (required)'
@@ -153,6 +174,38 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme nvm-id-ctrl options" _nvmidctrl
 			;;
+		(nvm-id-ns)
+			local _nvmidns
+			_nvmidns=(
+			/dev/nvme':supply a device to use (required)'
+			--namespace-id=':show infos for namespace <nsid>'
+			-n':alias of --namespace-id'
+			--uuid-index=':uuid index'
+			-U':alias for --uuid-index'
+			--output-format=':Output format: normal|json|binary'
+			-o':alias for --output-format'
+			--verbose':show infos verbosely'
+			-v':alias of --verbose'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme nvm-id-ns options" _nvmidns
+			;;
+		(id-ns-lba-format)
+			local _nvm_idns_lba_format
+			_nvm_idns_lba_format=(
+			/dev/nvme':supply a device to use (required)'
+			--lba-format-index=':show infos for lba format index <lba-format-index>'
+			-i':alias of --lba-format-index'
+			--uuid-index=':uuid index'
+			-U':alias for --uuid-index'
+			--output-format=':Output format: normal|json|binary'
+			-o':alias for --output-format'
+			--verbose':show infos verbosely'
+			-v':alias of --verbose'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme nvm-id-ns-lba-format options" _nvm_idns_lba_format
+			;;
 		(list-endgrp)
 			local _listendgrp
 			_listendgrp=(
@@ -516,6 +569,30 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme supported-log-pages options" _support
 			;;
+		(media-unit-stat-log)
+			local _medialog
+			_medialog=(
+			/dev/nvme':supply a device to use (required)'
+			--dom-id=':show infos for domain id'
+			-d':alias of --dom-id'
+			--raw-binary':dump infos in binary format'
+			-b':alias of --raw-binary'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme media-unit-stat-log" _medialog
+			;;
+		(supported-cap-config-log)
+			local _caplog
+			_caplog=(
+			/dev/nvme':supply a device to use (required)'
+			--dom-id=':show infos for domain id'
+			-d':alias of --dom-id'
+			--raw-binary':dump infos in binary format'
+			-b':alias of --raw-binary'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme supported-cap-config-log" _caplog
+			;;
 		(admin-passthru)
 			local _admin
 			_admin=(
@@ -694,6 +771,8 @@ _nvme () {
 			-n':alias of --namespace-id'
 			--numd=':number of dwords of reservation status to xfer'
 			-d':alias of --numd'
+			--eds':request extended data structure'
+			-e':alias of --eds'
 			--raw-binary':dump output in binary format'
 			-b':alias of --raw-binary'
 			)
@@ -899,8 +978,8 @@ _nvme () {
 			     resv-report flush compare read write copy show-regs persistent-event-log
 				 pred-lat-event-agg-log nvm-id-ctrl endurance-event-agg-log lba-status-log
 				 resv-notif-log capacity-mgmt id-domain boot-part-log fid-support-effects-log
-				 supported-log-pages lockdown
-				 supported-log-pages list-endgrp
+				 supported-log-pages lockdown media-unit-stat-log id-ns-lba-format nvm-id-ns
+				 nvm-id-ns-lba-format supported-cap-config-log
 			   )
 			_arguments '*:: :->subcmds'
 			_describe -t commands "help: infos on a specific nvme command, or provide no option to see a synopsis of all nvme commands" _h