diff --git a/Documentation/nvme-intel-internal-log.txt b/Documentation/nvme-intel-internal-log.txt
index 569f4d713c..c4d766294d 100644
--- a/Documentation/nvme-intel-internal-log.txt
+++ b/Documentation/nvme-intel-internal-log.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 		[--region=<NUM>, r <NUM>]
 		[--nlognum=<NUM>, m <NUM>]
 		[--namespace-id=<NUM>, -n <NUM>]
-		[--output-file=<FILE>, -o <FILE>]
+		[--output-file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -40,7 +40,7 @@ OPTIONS
 --namespace-id=<NUM>::
 	Namespace to use.
 
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device name provided
 
diff --git a/Documentation/nvme-sndk-namespace-resize.txt b/Documentation/nvme-sndk-namespace-resize.txt
index 3eab9ec69a..fca662b2d1 100644
--- a/Documentation/nvme-sndk-namespace-resize.txt
+++ b/Documentation/nvme-sndk-namespace-resize.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme sndk namespace-resize' <device> [--nsid=<NAMESPACE ID>, -n <NAMSPACE ID>]
-			[--op_option=<OP OPTION>, -o <OP OPTION>]
+			[--op_option=<OP OPTION>, -O <OP OPTION>]
 			[<global-options>]
 
 DESCRIPTION
@@ -29,7 +29,7 @@ OPTIONS
 --namespace-id=<NAMESPACE_ID>::
 	Namespace ID; ID of the namespace to resize
 
--o <OP OPTION>::
+-O <OP OPTION>::
 --op-option=<OP OPTION>::
 	Overprovisioning Option; defaults to 0xF
 	Valid Values:
@@ -46,7 +46,7 @@ EXAMPLES
 * Resizes namespace 1 to 50% of the original TNVMCAP reported value:
 +
 ------------
-# nvme sndk namespace-resize /dev/nvme0 -n 1 -o 3
+# nvme sndk namespace-resize /dev/nvme0 -n 1 -O 3
 ------------
 * Resizes namespace 2 to 7% of the original TNVMCAP reported value:
 +
diff --git a/Documentation/nvme-sndk-vs-error-reason-identifier.txt b/Documentation/nvme-sndk-vs-error-reason-identifier.txt
index ac771352d8..65b0d84e67 100644
--- a/Documentation/nvme-sndk-vs-error-reason-identifier.txt
+++ b/Documentation/nvme-sndk-vs-error-reason-identifier.txt
@@ -8,7 +8,7 @@ nvme-sndk-vs-error-reason-identifier - Retrieve sndk device's telemetry log erro
 SYNOPSIS
 --------
 [verse]
-'nvme sndk vs-error-reason-identifier' <device> [--log-id=<NUM>, -i <NUM>] [--file=<FILE>, -o <FILE>]
+'nvme sndk vs-error-reason-identifier' <device> [--log-id=<NUM>, -i <NUM>] [--file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -33,7 +33,7 @@ OPTIONS
 	Use id 8 for the controller initiated log page.
 	The default is 7/host generated
 
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to "<device serial number>_error_reason_identifier_host_<date>_<time>.bin" for
 	the host generated log or "<device serial number>_error_reason_identifier_ctlr_<date>_<time>.bin" for
@@ -46,12 +46,12 @@ EXAMPLES
 * Retrieves the host generated error reason identifier field and save it in file host_gen_error_reason_id.bin.
 +
 --------
-# nvme sndk vs-error-reason-identifier /dev/nvme0 -i 7 -o host_gen_error_reason_id.bin
+# nvme sndk vs-error-reason-identifier /dev/nvme0 -i 7 -O host_gen_error_reason_id.bin
 --------
 * Retrieves the controller initiated error reason identifier field and save it in file ctlr_init_error_reason_id.bin.
 +
 --------
-# nvme sndk vs-error-reason-identifier /dev/nvme0 -i 8 -o ctlr_init_error_reason_id.bin
+# nvme sndk vs-error-reason-identifier /dev/nvme0 -i 8 -O ctlr_init_error_reason_id.bin
 --------
 
 NVME
diff --git a/Documentation/nvme-sndk-vs-internal-log.txt b/Documentation/nvme-sndk-vs-internal-log.txt
index a304aa3333..ee9b22edb5 100644
--- a/Documentation/nvme-sndk-vs-internal-log.txt
+++ b/Documentation/nvme-sndk-vs-internal-log.txt
@@ -8,7 +8,7 @@ nvme-sndk-vs-internal-log - Retrieve sndk device's internal firmware log and sav
 SYNOPSIS
 --------
 [verse]
-'nvme sndk vs-internal-log' <device> [--output-file=<FILE>, -o <FILE>]
+'nvme sndk vs-internal-log' <device> [--output-file=<FILE>, -O <FILE>]
 			[--transfer-size=<SIZE>, -s <SIZE>]
 			[--data-area=<DATA AREA>, -d <DATA_AREA>]
 			[--file-size=<FILE SIZE>, -f <FILE SIZE>]
@@ -29,7 +29,7 @@ Results for any other device are undefined.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device serial number followed by
 	"_internal_fw_log_<date>_<time>.bin" suffix
@@ -86,12 +86,12 @@ EXAMPLES
 * Gets the internal firmware log from the device and saves to defined file in current directory (e.g. test.bin):
 +
 ------------
-# nvme sndk vs-internal-log /dev/nvme0 -o test.bin
+# nvme sndk vs-internal-log /dev/nvme0 -O test.bin
 ------------
 * Gets the internal firmware log from the device and saves to defined file with pathname (e.g. /tmp/test):
 +
 ------------
-# nvme sndk vs-internal-log /dev/nvme0 -o /tmp/test
+# nvme sndk vs-internal-log /dev/nvme0 -O /tmp/test
 ------------
 * Gets the internal firmware log from the device transferring the data in 64k chunks and saves to default file in current directory (e.g. STM00019F3F9_internal_fw_log_20171127_100754.bin):
 +
@@ -106,24 +106,24 @@ EXAMPLES
 * Gets the internal firmware log up to data area 3 from the device in 3 files of 0x1000000 bytes:
 +
 ------------
-# nvme sndk vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x0000000 -o /tmp/sn340_dui_data_1.bin
-# nvme sndk vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x1000000 -o /tmp/sn340_dui_data_2.bin
-# nvme sndk vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x2000000 -o /tmp/sn340_dui_data_3.bin
+# nvme sndk vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x0000000 -O /tmp/sn340_dui_data_1.bin
+# nvme sndk vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x1000000 -O /tmp/sn340_dui_data_2.bin
+# nvme sndk vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x2000000 -O /tmp/sn340_dui_data_3.bin
 ------------
 * Gets the host telemetry log page to data area 3 from the device and stores it in file host-telem-log-da3.bin:
 +
 ------------
-# nvme sndk vs-internal-log /dev/nvme1 -t host -o host-telem-log-da3.bin -d 3
+# nvme sndk vs-internal-log /dev/nvme1 -t host -O host-telem-log-da3.bin -d 3
 ------------
 * Gets the controller telemetry log page to data area 3 from the device and stores it in file ctlr-telem-log-da3.bin:
 +
 ------------
-# nvme sndk vs-internal-log /dev/nvme1 -t controller -o ctlr-telem-log-da3.bin -d 3
+# nvme sndk vs-internal-log /dev/nvme1 -t controller -O ctlr-telem-log-da3.bin -d 3
 ------------
 * Gets both host and controller telemetry log pages to data area 3 from the device and packages them in a tar file:
 +
 ------------
-# nvme sndk vs-internal-log /dev/nvme1 -t both -o both-telem-log-da3.tar -d 3
+# nvme sndk vs-internal-log /dev/nvme1 -t both -O both-telem-log-da3.tar -d 3
 ------------
 
 NVME
diff --git a/Documentation/nvme-toshiba-vs-internal-log.txt b/Documentation/nvme-toshiba-vs-internal-log.txt
index 3e216ddd10..e4915c45f5 100644
--- a/Documentation/nvme-toshiba-vs-internal-log.txt
+++ b/Documentation/nvme-toshiba-vs-internal-log.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme toshiba vs-internal-log ' <device>
-			[--output-file=<FILE>, -o <FILE>] (optional)
+			[--output-file=<FILE>, -O <FILE>] (optional)
 			[--saved-log, -s] (optional)
 			[<global-options>]
 
@@ -35,7 +35,7 @@ A progress runner is included when data is written to file and a page count is i
 OPTIONS
 -------
 
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output binary file. Defaults to text-formatted dump to stdout
 
diff --git a/Documentation/nvme-toshiba-vs-smart-add-log.txt b/Documentation/nvme-toshiba-vs-smart-add-log.txt
index a456ade542..19f38d5fd9 100644
--- a/Documentation/nvme-toshiba-vs-smart-add-log.txt
+++ b/Documentation/nvme-toshiba-vs-smart-add-log.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'nvme toshiba vs-smart-add-log ' <device> [--log=<NUM>, -l <NUM>]
 	  		[--namespace-id=<NUM>, -n <NUM>]
-			[--output-file=<FILE>, -o <FILE>]
+			[--output-file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -40,7 +40,7 @@ OPTIONS
 -n <NUM>::
 --namespace-id=<NUM>::
 
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output binary file. Defaults to text-formatted dump to stdout
 
diff --git a/Documentation/nvme-virtium-save-smart-to-vtview-log.txt b/Documentation/nvme-virtium-save-smart-to-vtview-log.txt
index 345d792894..f5804bee52 100644
--- a/Documentation/nvme-virtium-save-smart-to-vtview-log.txt
+++ b/Documentation/nvme-virtium-save-smart-to-vtview-log.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'nvme virtium save-smart-to-vtview-log' <device> [--run-time=<NUM> | -r <NUM>]
 			[--freq=<NUM> | -f <NUM>]
-			[--output-file=<FILE> | -o <FILE>]
+			[--output-file=<FILE> | -O <FILE>]
 			[--test-name=<NAME> | -n <NAME>]
 			[<global-options>]
 
@@ -49,7 +49,7 @@ OPTIONS
 	(optional) How often you want to log SMART data (0.25 = 15', 0.5 = 30',
 	1 = 1 hour, 2 = 2 hours, etc.). Default = 10 hours.
 
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	(optional) Name of the log file (give it a name that easy for you to
 	remember what the test is). You can leave it blank too, the file name
diff --git a/Documentation/nvme-wdc-cap-diag.txt b/Documentation/nvme-wdc-cap-diag.txt
index 57762e1f88..4e1c218860 100644
--- a/Documentation/nvme-wdc-cap-diag.txt
+++ b/Documentation/nvme-wdc-cap-diag.txt
@@ -8,7 +8,7 @@ nvme-wdc-cap-diag - Retrieve WDC device's diagnostic log and save to file.
 SYNOPSIS
 --------
 [verse]
-'nvme wdc cap-diag' <device> [--output-file=<FILE>, -o <FILE>] [--transfer-size=<SIZE>, -s <SIZE>]
+'nvme wdc cap-diag' <device> [--output-file=<FILE>, -O <FILE>] [--transfer-size=<SIZE>, -s <SIZE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -24,7 +24,7 @@ Results for any other device are undefined.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device serial number followed by "cap_diag" suffix
 
@@ -44,12 +44,12 @@ EXAMPLES
 * Gets the capture diagnostics log from the device and saves to defined file in current directory (e.g. testSTM00019F3F9cap_diag.bin):
 +
 ------------
-# nvme wdc cap-diag /dev/nvme0 -o test
+# nvme wdc cap-diag /dev/nvme0 -O test
 ------------
 * Gets the capture diagnostics log from the device and saves to defined file with pathname (e.g. /tmp/testSTM00019F3F9cap_diag.bin):
 +
 ------------
-# nvme wdc cap-diag /dev/nvme0 -o /tmp/test
+# nvme wdc cap-diag /dev/nvme0 -O /tmp/test
 ------------
 * Gets the capture diagnostics log from the device transferring the data in 64k chunks and saves to default file in current directory (e.g. STM00019F3F9internal_fw_log.bin):
 +
diff --git a/Documentation/nvme-wdc-drive-log.txt b/Documentation/nvme-wdc-drive-log.txt
index c0025d79cd..42407bf907 100644
--- a/Documentation/nvme-wdc-drive-log.txt
+++ b/Documentation/nvme-wdc-drive-log.txt
@@ -8,7 +8,7 @@ nvme-wdc-drive-log - Retrieve WDC device's drive log and save to file.
 SYNOPSIS
 --------
 [verse]
-'nvme wdc drive-log' <device> [--output-file=<FILE>, -o <FILE>]
+'nvme wdc drive-log' <device> [--output-file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -25,7 +25,7 @@ Results for any other device are undefined.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device serial number followed by "drive_log" suffix
 
@@ -41,12 +41,12 @@ EXAMPLES
 * Gets the drive log from the device and saves to defined file in current directory (e.g. testSTM00019F3F9drive_log.bin):
 +
 ------------
-# nvme wdc drive-log /dev/nvme0 -o test
+# nvme wdc drive-log /dev/nvme0 -O test
 ------------
 * Gets the drive log from the device and saves to defined file with pathname (e.g. /tmp/testSTM00019F3F9drive_log.bin):
 +
 ------------
-# nvme wdc drive-log /dev/nvme0 -o /tmp/test
+# nvme wdc drive-log /dev/nvme0 -O /tmp/test
 ------------
 
 NVME
diff --git a/Documentation/nvme-wdc-enc-get-log.txt b/Documentation/nvme-wdc-enc-get-log.txt
index b22f66d190..4f95ed9121 100644
--- a/Documentation/nvme-wdc-enc-get-log.txt
+++ b/Documentation/nvme-wdc-enc-get-log.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme wdc enc-get-log' <device> [--log-id=<NUM>, -l <NUM>]
-			[--output-file=<FILE>, -o <FILE>]
+			[--output-file=<FILE>, -O <FILE>]
 			[--transfer-size=<SIZE>, -s <SIZE>]
 			[<global-options>]
 
@@ -33,7 +33,7 @@ On success it returns the enclosure log data, error code otherwise.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file pathname
 
@@ -50,12 +50,12 @@ EXAMPLES
   size(0x2000) and saves to defined file in current directory:
 +
 ------------
-# nvme wdc enc-get-log /dev/nvme0 -l 0xd1 -o d1_log.bin -s 0x2000
+# nvme wdc enc-get-log /dev/nvme0 -l 0xd1 -O d1_log.bin -s 0x2000
 ------------
 * Gets the enclosure log from the device based on the log id(0xd2) with default transfer size(0x1000) and saves to defined file in current directory:
 +
 ------------
-# nvme wdc enc-get-log /dev/nvme0 -l 0xd2 -o d1_log.bin 
+# nvme wdc enc-get-log /dev/nvme0 -l 0xd2 -O d1_log.bin 
 ------------
 
 NVME
diff --git a/Documentation/nvme-wdc-get-crash-dump.txt b/Documentation/nvme-wdc-get-crash-dump.txt
index 2a03176edd..7df277d4b7 100644
--- a/Documentation/nvme-wdc-get-crash-dump.txt
+++ b/Documentation/nvme-wdc-get-crash-dump.txt
@@ -8,7 +8,7 @@ nvme-wdc-get-crash-dump - Retrieve WDC device's crash dump.
 SYNOPSIS
 --------
 [verse]
-'nvme wdc get-crash-dump' <device> [--output-file=<FILE>, -o <FILE>]
+'nvme wdc get-crash-dump' <device> [--output-file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -26,7 +26,7 @@ Results for any other device are undefined.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device serial number followed by "crash_dump" suffix
 
@@ -42,12 +42,12 @@ EXAMPLES
 * Gets the crash dump from the device and saves to defined file in current directory (e.g. testSTM00019F3F9crash_dump.bin):
 +
 ------------
-# nvme wdc get-crash-dump /dev/nvme0 -o test
+# nvme wdc get-crash-dump /dev/nvme0 -O test
 ------------
 * Gets the crash dump from the device and saves to defined file with pathname (e.g. /tmp/testSTM00019F3F9crash_dump.bin):
 +
 ------------
-# nvme wdc get-crash-dump /dev/nvme0 -o /tmp/test
+# nvme wdc get-crash-dump /dev/nvme0 -O /tmp/test
 ------------
 
 NVME
diff --git a/Documentation/nvme-wdc-get-pfail-dump.txt b/Documentation/nvme-wdc-get-pfail-dump.txt
index 86206556c9..f784eddccd 100644
--- a/Documentation/nvme-wdc-get-pfail-dump.txt
+++ b/Documentation/nvme-wdc-get-pfail-dump.txt
@@ -8,7 +8,7 @@ nvme-wdc-get-pfail-dump - Retrieve WDC device's pfail crash dump.
 SYNOPSIS
 --------
 [verse]
-'nvme wdc get-pfail-dump' <device> [--output-file=<FILE>, -o <FILE>]
+'nvme wdc get-pfail-dump' <device> [--output-file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -26,7 +26,7 @@ Results for any other device are undefined.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device serial number followed by "pfail_dump" suffix
 
@@ -44,12 +44,12 @@ EXAMPLES
 (e.g. testSTM00019F3F9_pfail_dump.bin):
 +
 ------------
-# nvme wdc get-pfail-dump /dev/nvme0 -o test
+# nvme wdc get-pfail-dump /dev/nvme0 -O test
 ------------
 * Gets the pfail crash dump from the device and saves to defined file with pathname (e.g. /tmp/testSTM00019F3F9_pfail_dump.bin):
 +
 ------------
-# nvme wdc get-pfail-dump /dev/nvme0 -o /tmp/test
+# nvme wdc get-pfail-dump /dev/nvme0 -O /tmp/test
 ------------
 
 NVME
diff --git a/Documentation/nvme-wdc-namespace-resize.txt b/Documentation/nvme-wdc-namespace-resize.txt
index 508dd4ecb6..b4e9111673 100644
--- a/Documentation/nvme-wdc-namespace-resize.txt
+++ b/Documentation/nvme-wdc-namespace-resize.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme wdc namespace-resize' <device> [--nsid=<NAMESPACE ID>, -n <NAMSPACE ID>]
-			[--op_option=<OP OPTION>, -o <OP OPTION>]
+			[--op_option=<OP OPTION>, -O <OP OPTION>]
 			[<global-options>]
 
 DESCRIPTION
@@ -29,7 +29,7 @@ OPTIONS
 --namespace-id=<NAMESPACE_ID>::
 	Namespace ID; ID of the namespace to resize
 
--o <OP OPTION>::
+-O <OP OPTION>::
 --op-option=<OP OPTION>::
 	Overprovisioning Option; defaults to 0xF
 	Valid Values:
@@ -46,7 +46,7 @@ EXAMPLES
 * Resizes namespace 1 to 50% of the original TNVMCAP reported value:
 +
 ------------
-# nvme wdc namespace-resize /dev/nvme0 -n 1 -o 3
+# nvme wdc namespace-resize /dev/nvme0 -n 1 -O 3
 ------------
 * Resizes namespace 2 to 7% of the original TNVMCAP reported value:
 +
diff --git a/Documentation/nvme-wdc-vs-error-reason-identifier.txt b/Documentation/nvme-wdc-vs-error-reason-identifier.txt
index de48f048d1..3c1f0ddc78 100644
--- a/Documentation/nvme-wdc-vs-error-reason-identifier.txt
+++ b/Documentation/nvme-wdc-vs-error-reason-identifier.txt
@@ -8,7 +8,7 @@ nvme-wdc-vs-error-reason-identifier - Retrieve WDC device's telemetry log error
 SYNOPSIS
 --------
 [verse]
-'nvme wdc vs-error-reason-identifier' <device> [--log-id=<NUM>, -i <NUM>] [--file=<FILE>, -o <FILE>]
+'nvme wdc vs-error-reason-identifier' <device> [--log-id=<NUM>, -i <NUM>] [--file=<FILE>, -O <FILE>]
 			[<global-options>]
 
 DESCRIPTION
@@ -33,7 +33,7 @@ OPTIONS
 	Use id 8 for the controller initiated log page. 
 	The default is 7/host generated
 
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to "<device serial number>_error_reason_identifier_host_<date>_<time>.bin" for 
 	the host generated log or "<device serial number>_error_reason_identifier_ctlr_<date>_<time>.bin" for 
@@ -46,12 +46,12 @@ EXAMPLES
 * Retrieves the host generated error reason identifier field and save it in file host_gen_error_reason_id.bin. 
 +
 --------
-# nvme wdc vs-error-reason-identifier /dev/nvme0 -i 7 -o host_gen_error_reason_id.bin
+# nvme wdc vs-error-reason-identifier /dev/nvme0 -i 7 -O host_gen_error_reason_id.bin
 --------
 * Retrieves the controller initiated error reason identifier field and save it in file ctlr_init_error_reason_id.bin. 
 +
 --------
-# nvme wdc vs-error-reason-identifier /dev/nvme0 -i 8 -o ctlr_init_error_reason_id.bin
+# nvme wdc vs-error-reason-identifier /dev/nvme0 -i 8 -O ctlr_init_error_reason_id.bin
 --------
 
 NVME
diff --git a/Documentation/nvme-wdc-vs-internal-log.txt b/Documentation/nvme-wdc-vs-internal-log.txt
index b3215e9718..b7b67f603c 100644
--- a/Documentation/nvme-wdc-vs-internal-log.txt
+++ b/Documentation/nvme-wdc-vs-internal-log.txt
@@ -8,7 +8,7 @@ nvme-wdc-vs-internal-log - Retrieve WDC device's internal firmware log and save
 SYNOPSIS
 --------
 [verse]
-'nvme wdc vs-internal-log' <device> [--output-file=<FILE>, -o <FILE>]
+'nvme wdc vs-internal-log' <device> [--output-file=<FILE>, -O <FILE>]
 			[--transfer-size=<SIZE>, -s <SIZE>]
 			[--data-area=<DATA AREA>, -d <DATA_AREA>]
 			[--file-size=<FILE SIZE>, -f <FILE SIZE>]
@@ -29,7 +29,7 @@ Results for any other device are undefined.
 
 OPTIONS
 -------
--o <FILE>::
+-O <FILE>::
 --output-file=<FILE>::
 	Output file; defaults to device serial number followed by
 	"_internal_fw_log_<date>_<time>.bin" suffix.
@@ -84,12 +84,12 @@ EXAMPLES
 * Gets the internal firmware log from the device and saves to defined file in current directory (e.g. test.bin):
 +
 ------------
-# nvme wdc vs-internal-log /dev/nvme0 -o test.bin
+# nvme wdc vs-internal-log /dev/nvme0 -O test.bin
 ------------
 * Gets the internal firmware log from the device and saves to defined file with pathname (e.g. /tmp/test):
 +
 ------------
-# nvme wdc vs-internal-log /dev/nvme0 -o /tmp/test
+# nvme wdc vs-internal-log /dev/nvme0 -O /tmp/test
 ------------
 * Gets the internal firmware log from the device transferring the data in 64k chunks and saves to default file in current directory (e.g. STM00019F3F9_internal_fw_log_20171127_100754.bin):
 +
@@ -104,19 +104,19 @@ EXAMPLES
 * Gets the internal firmware log up to data area 3 from the device in 3 files of 0x1000000 bytes:
 +
 ------------
-# nvme wdc vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x0000000 -o /tmp/sn340_dui_data_1.bin
-# nvme wdc vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x1000000 -o /tmp/sn340_dui_data_2.bin
-# nvme wdc vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x2000000 -o /tmp/sn340_dui_data_3.bin
+# nvme wdc vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x0000000 -O /tmp/sn340_dui_data_1.bin
+# nvme wdc vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x1000000 -O /tmp/sn340_dui_data_2.bin
+# nvme wdc vs-internal-log /dev/nvme0 -d 3 -f 0x1000000 -t 0x2000000 -O /tmp/sn340_dui_data_3.bin
 ------------
 * Gets the host telemetry log page to data area 3 from the device and stores it in file host-telem-log-da3.bin:
 +
 ------------
-# nvme wdc vs-internal-log /dev/nvme1 -t host -o host-telem-log-da3.bin -d 3
+# nvme wdc vs-internal-log /dev/nvme1 -t host -O host-telem-log-da3.bin -d 3
 ------------
 * Gets the controller telemetry log page to data area 3 from the device and stores it in file ctlr-telem-log-da3.bin:
 +
 ------------
-# nvme wdc vs-internal-log /dev/nvme1 -t controller -o ctlr-telem-log-da3.bin -d 3
+# nvme wdc vs-internal-log /dev/nvme1 -t controller -O ctlr-telem-log-da3.bin -d 3
 ------------
 
 NVME
diff --git a/Documentation/nvme-zns-zone-mgmt-send.txt b/Documentation/nvme-zns-zone-mgmt-send.txt
index 52149985ab..15999af4e7 100644
--- a/Documentation/nvme-zns-zone-mgmt-send.txt
+++ b/Documentation/nvme-zns-zone-mgmt-send.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme zns zone-mgmt-send' <device> [--namespace-id=<NUM> | -n <NUM>]
-			[--start-lba=<IONUM>, -s <IONUM>] [--zsaso, -o]
+			[--start-lba=<IONUM>, -s <IONUM>] [--zsaso, -O]
 			[--select-all, -a] [--zsa=<NUM>, -z <NUM>]
 			[--data-len=<IONUM>, -l <IONUM>]
 			[--data=<FILE>, -d <FILE>]
@@ -38,7 +38,7 @@ OPTIONS
 --data-len=<NUM>::
 	Send data buffer length
 
--o::
+-O::
 --zsaso::
 	Zone Send Action Specific Option
 
diff --git a/nvme.c b/nvme.c
index 6a8350b9ab..5c875adede 100644
--- a/nvme.c
+++ b/nvme.c
@@ -358,9 +358,8 @@ static void setup_transport_handle(struct libnvme_global_ctx *ctx,
 	libnvme_transport_handle_set_submit_entry(hdl, nvme_submit_entry);
 	libnvme_transport_handle_set_submit_exit(hdl, nvme_submit_exit);
 	libnvme_transport_handle_set_decide_retry(hdl, nvme_decide_retry);
-	libnvme_set_dry_run(ctx, argconfig_parse_seen(opts, "dry-run"));
-	if (nvme_args.timeout !=  NVME_DEFAULT_IOCTL_TIMEOUT ||
-			argconfig_parse_seen(opts, "timeout"))
+	libnvme_set_dry_run(ctx, nvme_args.dry_run);
+	if (nvme_args.timeout != NVME_DEFAULT_IOCTL_TIMEOUT)
 		libnvme_transport_handle_set_timeout(hdl, nvme_args.timeout);
 }
 
@@ -381,7 +380,7 @@ int parse_and_open(struct libnvme_global_ctx **ctx,
 		return -ENOMEM;
 
 	libnvme_set_ioctl_probing(ctx_new,
-		!argconfig_parse_seen(opts, "no-ioctl-probing"));
+		!nvme_args.no_ioctl_probing);
 
 	ret = get_transport_handle(ctx_new, argc, argv, O_RDONLY, &hdl_new);
 	if (ret) {
@@ -416,7 +415,7 @@ int open_exclusive(struct libnvme_global_ctx **ctx,
 		return -ENOMEM;
 
 	libnvme_set_ioctl_probing(ctx_new,
-		!argconfig_parse_seen(opts, "no-ioctl-probing"));
+		!nvme_args.no_ioctl_probing);
 
 	ret = get_transport_handle(ctx_new, argc, argv, flags, &hdl_new);
 	if (ret) {
@@ -546,7 +545,7 @@ static int get_smart_log(int argc, char **argv, struct command *acmd, struct plu
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	smart_log = libnvme_alloc(sizeof(*smart_log));
@@ -1109,7 +1108,7 @@ static int get_effects_log(int argc, char **argv, struct command *acmd, struct p
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	list_head_init(&log_pages);
@@ -1181,7 +1180,7 @@ static int get_supported_log_pages(int argc, char **argv, struct command *acmd,
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	supports = libnvme_alloc(sizeof(*supports));
@@ -2496,7 +2495,7 @@ static int get_log(int argc, char **argv, struct command *acmd, struct plugin *p
 		       libnvme_transport_handle_get_name(hdl), cfg.log_id,
 		       cfg.namespace_id);
 		d(log, cfg.log_len, 16, 1);
-		if (argconfig_parse_seen(opts, "verbose"))
+		if (nvme_args.verbose)
 			nvme_show_log(libnvme_transport_handle_get_name(hdl),
 				      &args, VERBOSE);
 	} else {
@@ -2546,7 +2545,7 @@ static int sanitize_log(int argc, char **argv, struct command *acmd, struct plug
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	sanitize_log = libnvme_alloc(sizeof(*sanitize_log));
@@ -2597,7 +2596,7 @@ static int get_fid_support_effects_log(int argc, char **argv, struct command *ac
 		return err;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	fid_support_log = libnvme_alloc(sizeof(*fid_support_log));
@@ -2649,7 +2648,7 @@ static int get_mi_cmd_support_effects_log(int argc, char **argv, struct command
 		return err;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	mi_cmd_support_log = libnvme_alloc(sizeof(*mi_cmd_support_log));
@@ -2773,7 +2772,7 @@ static int list_ns(int argc, char **argv, struct command *acmd, struct plugin *p
 		return -EINVAL;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ns_list = libnvme_alloc(sizeof(*ns_list));
@@ -2837,7 +2836,7 @@ static int id_ns_lba_format(int argc, char **argv, struct command *acmd, struct
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ns = libnvme_alloc(sizeof(*ns));
@@ -3534,7 +3533,7 @@ static int list_subsys(int argc, char **argv, struct command *acmd,
 		return -EINVAL;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ctx = libnvme_create_global_ctx(stdout, log_level);
@@ -3632,7 +3631,7 @@ static int list(int argc, char **argv, struct command *acmd, struct plugin *plug
 		return -EINVAL;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ctx = libnvme_create_global_ctx(stdout, log_level);
@@ -3700,7 +3699,7 @@ int __id_ctrl(int argc, char **argv, struct command *acmd, struct plugin *plugin
 	if (cfg.vendor_specific)
 		flags |= VS;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ctrl = libnvme_alloc(sizeof(*ctrl));
@@ -3749,7 +3748,7 @@ static int nvm_id_ctrl(int argc, char **argv, struct command *acmd,
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ctrl_nvm = libnvme_alloc(sizeof(*ctrl_nvm));
@@ -3806,7 +3805,7 @@ static int nvm_id_ns(int argc, char **argv, struct command *acmd,
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	if (!cfg.namespace_id) {
@@ -3880,7 +3879,7 @@ static int nvm_id_ns_lba_format(int argc, char **argv, struct command *acmd, str
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	ns = libnvme_alloc(sizeof(*ns));
@@ -3951,7 +3950,7 @@ static int ns_descs(int argc, char **argv, struct command *acmd, struct plugin *
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	if (!cfg.namespace_id) {
@@ -4032,7 +4031,7 @@ static int id_ns(int argc, char **argv, struct command *acmd, struct plugin *plu
 	if (cfg.vendor_specific)
 		flags |= VS;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	if (!cfg.namespace_id) {
@@ -4108,7 +4107,7 @@ static int cmd_set_independent_id_ns(int argc, char **argv, struct command *acmd
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	if (!cfg.namespace_id) {
@@ -4270,7 +4269,7 @@ static int id_uuid(int argc, char **argv, struct command *acmd, struct plugin *p
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	uuid_list = libnvme_alloc(sizeof(*uuid_list));
@@ -4323,7 +4322,7 @@ static int id_iocs(int argc, char **argv, struct command *acmd, struct plugin *p
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	iocs = libnvme_alloc(sizeof(*iocs));
@@ -4527,7 +4526,7 @@ static int primary_ctrl_caps(int argc, char **argv, struct command *acmd, struct
 		return err;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	caps = libnvme_alloc(sizeof(*caps));
@@ -4848,7 +4847,7 @@ static int self_test_log(int argc, char **argv, struct command *acmd, struct plu
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	log = libnvme_alloc(sizeof(*log));
@@ -5069,7 +5068,7 @@ static int get_feature(int argc, char **argv, struct command *acmd,
 		return -1;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	nvme_show_init();
@@ -5519,7 +5518,7 @@ static int subsystem_reset(int argc, char **argv, struct command *acmd, struct p
 			nvme_show_error("Subsystem-reset: NVM Subsystem Reset not supported.");
 		else
 			nvme_show_error("Subsystem-reset: %s", libnvme_strerror(-err));
-	} else if (argconfig_parse_seen(opts, "verbose"))
+	} else if (nvme_args.verbose)
 		printf("resetting subsystem through %s\n", libnvme_transport_handle_get_name(hdl));
 
 	return err;
@@ -5547,7 +5546,7 @@ static int reset(int argc, char **argv, struct command *acmd, struct plugin *plu
 	err = libnvme_reset_ctrl(hdl);
 	if (err < 0)
 		nvme_show_error("Reset: %s", libnvme_strerror(-err));
-	else if (argconfig_parse_seen(opts, "verbose"))
+	else if (nvme_args.verbose)
 		printf("resetting controller %s\n", libnvme_transport_handle_get_name(hdl));
 
 	return err;
@@ -5582,7 +5581,7 @@ static int ns_rescan(int argc, char **argv, struct command *acmd, struct plugin
 	err = libnvme_rescan_ns(hdl);
 	if (err < 0)
 		nvme_show_error("Namespace Rescan: %s\n", libnvme_strerror(-err));
-	else if (argconfig_parse_seen(opts, "verbose"))
+	else if (nvme_args.verbose)
 		printf("rescanning namespaces through %s\n", libnvme_transport_handle_get_name(hdl));
 
 	return err;
@@ -5953,7 +5952,7 @@ static int show_registers(int argc, char **argv, struct command *acmd, struct pl
 		return err;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	bar = mmap_registers(hdl, false);
@@ -6230,7 +6229,7 @@ static int get_register(int argc, char **argv, struct command *acmd, struct plug
 		return err;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	bar = mmap_registers(hdl, false);
@@ -6581,7 +6580,7 @@ static int get_property(int argc, char **argv, struct command *acmd, struct plug
 		return -EINVAL;
 	}
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 
 	err = nvme_get_single_property(hdl, &cfg, &value);
@@ -7648,7 +7647,7 @@ static int write_zeroes(int argc, char **argv,
 
 	printf("NVME Write Zeroes Success\n");
 
-	if (!cfg.nsz || !argconfig_parse_seen(opts, "verbose"))
+	if (!cfg.nsz || !nvme_args.verbose)
 		return err;
 
 	if (cmd.result & 0x1)
@@ -9142,7 +9141,7 @@ static int dir_receive(int argc, char **argv, struct command *acmd, struct plugi
 	if (err)
 		return err;
 
-	if (cfg.human_readable || argconfig_parse_seen(opts, "verbose"))
+	if (cfg.human_readable || nvme_args.verbose)
 		flags |= VERBOSE;
 	if (cfg.raw_binary)
 		flags = BINARY;
@@ -10316,7 +10315,7 @@ static int tls_key(int argc, char **argv, struct command *acmd, struct plugin *p
 			return err;
 		}
 
-		if (argconfig_parse_seen(opts, "verbose"))
+		if (nvme_args.verbose)
 			printf("exporting to %s\n", cfg.keyfile);
 
 		return 0;
@@ -10328,7 +10327,7 @@ static int tls_key(int argc, char **argv, struct command *acmd, struct plugin *p
 			return err;
 		}
 
-		if (argconfig_parse_seen(opts, "verbose"))
+		if (nvme_args.verbose)
 			printf("importing from %s\n", cfg.keyfile);
 	} else {
 		err = libnvme_revoke_tls_key(ctx, cfg.keyring, cfg.keytype,
@@ -10339,7 +10338,7 @@ static int tls_key(int argc, char **argv, struct command *acmd, struct plugin *p
 			return err;
 		}
 
-		if (argconfig_parse_seen(opts, "verbose"))
+		if (nvme_args.verbose)
 			printf("revoking key\n");
 	}
 
@@ -10383,7 +10382,7 @@ static int show_topology_cmd(int argc, char **argv, struct command *acmd, struct
 		return err;
 	}
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	if (!strcmp(cfg.ranking, "namespace")) {
@@ -10832,7 +10831,7 @@ static int get_power_measurement_log(int argc, char **argv, struct command *acmd
 	if (cfg.raw_binary)
 		flags = BINARY;
 
-	if (argconfig_parse_seen(opts, "verbose"))
+	if (nvme_args.verbose)
 		flags |= VERBOSE;
 
 	/* First read minimum size to discover the full log size */
@@ -11383,7 +11382,7 @@ int main(int argc, char **argv)
 	if (err)
 		return err;
 
-	err = handle_plugin(argc - 1, &argv[1], nvme.extensions);
+	err = handle_plugin(argc, argv, nvme.extensions);
 	if (err == -ENOTTY)
 		general_help(&builtin, NULL);
 
diff --git a/nvme.h b/nvme.h
index c3a7003317..110d7a3f88 100644
--- a/nvme.h
+++ b/nvme.h
@@ -69,16 +69,25 @@ struct nvme_args {
 #endif /* CONFIG_JSONC */
 
 /*
- * the ordering of the arguments matters, as the argument parser uses the first match, thus any
- * command which defines -t shorthand will match first.
+ * Global options are placed after an OPT_GROUP separator so they appear in a
+ * dedicated "Global options" section in help output.  Command-specific options
+ * (##__VA_ARGS__) are placed first so that their short-option bindings take
+ * precedence over the global ones when both share the same letter (e.g. some
+ * plugins use -v for "value").  The leading OPT_GROUP("Options") entry serves
+ * two purposes: it creates the "Options" section header for command-specific
+ * options in help output, and it allows GCC's ##__VA_ARGS__ comma deletion to
+ * work correctly when no command-specific options are present (the section
+ * header is then suppressed automatically because it has no following options).
  */
 #define NVME_ARGS(n, ...)                                                              \
 	struct argconfig_commandline_options n[] = {                                   \
+		OPT_GROUP("Options"),                                                  \
+		##__VA_ARGS__,                                                         \
+		OPT_GROUP("Global options"),                                           \
 		OPT_INCR("verbose",      'v', &nvme_args.verbose,                      \
                          "Increase output verbosity"),                                 \
 		OPT_FMT("output-format", 'o', &nvme_args.output_format,                \
                          DESC_OUTPUT_FORMAT),                                          \
-		##__VA_ARGS__,                                                         \
 		OPT_UINT("timeout",        0, &nvme_args.timeout,                      \
                          "timeout value, in milliseconds"),                            \
 		OPT_FLAG("dry-run",        0, &nvme_args.dry_run,                      \
diff --git a/plugin.c b/plugin.c
index fa6d960cef..787649d1c3 100644
--- a/plugin.c
+++ b/plugin.c
@@ -6,8 +6,10 @@
 
 #include <libnvme.h>
 
+#include "nvme.h"
 #include "plugin.h"
 #include "util/argconfig.h"
+#include "util/cleanup.h"
 
 static int version_cmd(struct plugin *plugin)
 {
@@ -152,7 +154,6 @@ void general_help(struct plugin *plugin, char *str)
 
 int handle_plugin(int argc, char **argv, struct plugin *plugin)
 {
-	char *str = argv[0];
 	char use[0x100];
 	struct plugin *extension;
 	struct program *prog = plugin->parent;
@@ -160,12 +161,25 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
 	struct command *cr = NULL;
 	bool cr_valid = false;
 	int dash_count = 0;
+	char *str;
 
 	if (!argc) {
 		general_help(plugin, NULL);
 		return 0;
 	}
 
+	NVME_ARGS(global_opts);
+	argconfig_parse_global(argc, argv, global_opts);
+	argc -= optind;
+	argv += optind;
+
+	if (!argc) {
+		general_help(plugin, NULL);
+		return 0;
+	}
+
+	str = argv[0];
+
 	if (!plugin->name)
 		snprintf(use, sizeof(use), "%s %s <device> [OPTIONS]", prog->name, str);
 	else
@@ -214,7 +228,14 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
 	extension = plugin->next;
 	while (extension) {
 		if (!strcmp(str, extension->name))
-			return handle_plugin(argc - 1, &argv[1], extension);
+			/*
+			 * argv[0] is the extension name (e.g. "intel").
+			 * Pass it as-is so that argconfig_parse_global()
+			 * inside the recursive call treats it as the
+			 * program-name placeholder that getopt skips, and
+			 * argv[1] becomes the subcommand.
+			 */
+			return handle_plugin(argc, argv, extension);
 		extension = extension->next;
 	}
 
@@ -225,10 +246,28 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
 	extension = plugin->next;
 	while (extension) {
 		if (!strncmp(str, extension->name, strlen(extension->name))) {
+			/*
+			 * Advance argv[0] past the "pluginname[-]" prefix so
+			 * it points at the subcommand string.  Then build a
+			 * temporary argv with the extension name prepended as
+			 * the program-name placeholder for getopt.
+			 */
+			__cleanup_free char **sub_argv = malloc((argc + 1) * sizeof(*sub_argv));
+			__cleanup_free char *name_copy = NULL;
+
+			if (!sub_argv)
+				return -ENOMEM;
+
 			argv[0] += strlen(extension->name);
 			while (*argv[0] == '-')
 				argv[0]++;
-			return handle_plugin(argc, &argv[0], extension);
+
+			name_copy = strdup(extension->name);
+			if (!name_copy)
+				return -ENOMEM;
+			sub_argv[0] = name_copy;
+			memcpy(&sub_argv[1], argv, argc * sizeof(*argv));
+			return handle_plugin(argc + 1, sub_argv, extension);
 		}
 		extension = extension->next;
 	}
diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c
index d965e740b8..41b085aa17 100644
--- a/plugins/intel/intel-nvme.c
+++ b/plugins/intel/intel-nvme.c
@@ -1379,8 +1379,8 @@ static int get_internal_log(int argc, char **argv, struct command *acmd,
 		OPT_INT("region",        'r', &cfg.core,         core),
 		OPT_INT("nlognum",       'm', &cfg.lnum,         nlognum),
 		OPT_UINT("namespace-id", 'n', &cfg.namespace_id, namespace_id),
-		OPT_FILE("output-file",  'o', &cfg.file,         file),
-		OPT_FLAG("verbose-nlog", 'v', &cfg.verbose,      verbose));
+		OPT_FILE("output-file",  'O', &cfg.file,         file),
+		OPT_FLAG("verbose-nlog", 'V', &cfg.verbose,      verbose));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 	if (err) {
diff --git a/plugins/lm/lm-nvme.c b/plugins/lm/lm-nvme.c
index 877738cf05..61e2c4ae3f 100644
--- a/plugins/lm/lm-nvme.c
+++ b/plugins/lm/lm-nvme.c
@@ -319,7 +319,7 @@ static int lm_migration_send(int argc, char **argv, struct command *acmd, struct
 		OPT_BYTE("csuuidi",	'U', &cfg.csuuidi, csuuidi),
 		OPT_BYTE("csvi",	'V', &cfg.csvi, csvi),
 		OPT_BYTE("uidx",	'u', &cfg.uidx, uidx),
-		OPT_LONG("offset",	'o', &cfg.offset, offset),
+		OPT_LONG("offset",	'O', &cfg.offset, offset),
 		OPT_UINT("numd",	'n', &cfg.numd, numd),
 		OPT_FILE("input-file",	'f', &cfg.input, input));
 
@@ -446,7 +446,7 @@ static int lm_migration_recv(int argc, char **argv, struct command *acmd, struct
 		OPT_BYTE("csuuidi",		'U', &cfg.csuuidi, csuuidi),
 		OPT_BYTE("csvi",		'V', &cfg.csvi, csvi),
 		OPT_BYTE("uidx",		'u', &cfg.uidx, uidx),
-		OPT_LONG("offset",		'o', &cfg.offset, offset),
+		OPT_LONG("offset",		'O', &cfg.offset, offset),
 		OPT_UINT("numd",		'n', &cfg.numd, numd),
 		OPT_FILE("output-file",		'f', &cfg.output, output),
 		OPT_FLAG("human-readable",	'H', &cfg.human_readable, human_readable_info));
diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
index a9ef52db5b..0804ada730 100644
--- a/plugins/memblaze/memblaze-nvme.c
+++ b/plugins/memblaze/memblaze-nvme.c
@@ -523,7 +523,7 @@ static int mb_set_powermanager_status(int argc, char **argv, struct command *acm
 	};
 
 	NVME_ARGS(opts,
-		OPT_UINT("value",		 'v', &cfg.value,		 value),
+		OPT_UINT("value",		 'V', &cfg.value,		 value),
 		OPT_FLAG("save",		 's', &cfg.save,		 save));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
index dc0f83da26..5ca1d5e244 100644
--- a/plugins/micron/micron-nvme.c
+++ b/plugins/micron/micron-nvme.c
@@ -718,8 +718,8 @@ static int micron_smbus_option(int argc, char **argv,
 	};
 
 	NVME_ARGS(opts,
-		OPT_STRING("option", 'o', "option", &opt.option, option),
-		OPT_UINT("value", 'v',	&opt.value, value),
+		OPT_STRING("option", 'O', "option", &opt.option, option),
+		OPT_UINT("value", 'V',	&opt.value, value),
 		OPT_UINT("save", 's', &opt.save, save));
 
 	err = micron_parse_options(&ctx, &hdl, argc, argv, desc, opts, &model);
@@ -2888,7 +2888,7 @@ static int micron_latency_stats_track(int argc, char **argv, struct command *acm
 	};
 
 	NVME_ARGS(opts,
-		OPT_STRING("option", 'o', "option", &opt.option, option),
+		OPT_STRING("option", 'O', "option", &opt.option, option),
 		OPT_STRING("command", 'c', "command", &opt.command, cmdstr),
 		OPT_UINT("threshold", 't', &opt.threshold, thrtime));
 
@@ -3260,7 +3260,7 @@ static int micron_telemetry_cntrl_option(int argc, char **argv,
 	};
 
 	NVME_ARGS(opts,
-		OPT_STRING("option", 'o', "option", &opt.option, option),
+		OPT_STRING("option", 'O', "option", &opt.option, option),
 		OPT_UINT("select", 's', &opt.select, select));
 
 	err = micron_parse_options(&ctx, &hdl, argc, argv, desc, opts, &model);
diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
index 86216a389b..9382cb7217 100644
--- a/plugins/netapp/netapp-nvme.c
+++ b/plugins/netapp/netapp-nvme.c
@@ -968,7 +968,7 @@ static int netapp_smdevices(int argc, char **argv, struct command *acmd,
 
 	if (num_smdevices) {
 		if (fmt == NNORMAL || fmt == NCOLUMN) {
-			if (argconfig_parse_seen(opts, "verbose"))
+			if (nvme_args.verbose)
 				netapp_smdevices_print_verbose(smdevices,
 						num_smdevices, fmt, devname);
 			else
@@ -1068,7 +1068,7 @@ static int netapp_ontapdevices(int argc, char **argv, struct command *acmd,
 
 	if (num_ontapdevices) {
 		if (fmt == NNORMAL || fmt == NCOLUMN) {
-			if (argconfig_parse_seen(opts, "verbose"))
+			if (nvme_args.verbose)
 				netapp_ontapdevices_print_verbose(ontapdevices,
 						num_ontapdevices, fmt, devname);
 			else
diff --git a/plugins/sandisk/sandisk-nvme.c b/plugins/sandisk/sandisk-nvme.c
index 20140c2807..ac60da6f3b 100644
--- a/plugins/sandisk/sandisk-nvme.c
+++ b/plugins/sandisk/sandisk-nvme.c
@@ -428,11 +428,11 @@ static int sndk_vs_internal_fw_log(int argc, char **argv,
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file",   'o', &cfg.file,      file),
+		OPT_FILE("output-file",   'O', &cfg.file,      file),
 		OPT_UINT("transfer-size", 's', &cfg.xfer_size, size),
 		OPT_UINT("data-area",     'd', &cfg.data_area, data_area),
 		OPT_FILE("type",          't', &cfg.type,      type),
-		OPT_FLAG("verbose",       'v', &cfg.verbose,   verbose),
+		OPT_FLAG("verbose",       'V', &cfg.verbose,   verbose),
 		OPT_LONG("file-size",     'f', &cfg.file_size, file_size),
 		OPT_LONG("offset",        'e', &cfg.offset,    offset),
 		OPT_END());
diff --git a/plugins/scaleflux/sfx-nvme.c b/plugins/scaleflux/sfx-nvme.c
index 8e43ca4a93..35b1050d83 100644
--- a/plugins/scaleflux/sfx-nvme.c
+++ b/plugins/scaleflux/sfx-nvme.c
@@ -954,7 +954,7 @@ static int sfx_set_feature(int argc, char **argv, struct command *acmd, struct p
 	NVME_ARGS(opts,
 		OPT_UINT("namespace-id",		'n',	&cfg.namespace_id,		namespace_id),
 		OPT_UINT("feature-id",			'f',	&cfg.feature_id,		feature_id),
-		OPT_UINT("value",			'v',	&cfg.value,			value),
+		OPT_UINT("value",			'V',	&cfg.value,			value),
 		OPT_FLAG("force",			's',	&cfg.force,			force));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
@@ -1379,7 +1379,7 @@ static int sfx_dump_evtlog(int argc, char **argv, struct command *acmd, struct p
 		OPT_UINT("namespace_id",	    'n',	&cfg.namespace_id,	namespace_id),
 		OPT_UINT("storage_medium",	    's',	&cfg.storage_medium,    storage_medium),
 		OPT_FLAG("parse",	            'p',	&cfg.parse,             parse),
-		OPT_FILE("output",                  'o',        &cfg.output,            output));
+		OPT_FILE("output",                  'O',        &cfg.output,            output));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 	if (err)
diff --git a/plugins/sed/sed.c b/plugins/sed/sed.c
index 0578a067de..ec61b4f0c5 100644
--- a/plugins/sed/sed.c
+++ b/plugins/sed/sed.c
@@ -54,7 +54,7 @@ OPT_ARGS(lock_opts) = {
 };
 
 OPT_ARGS(discovery_opts) = {
-	OPT_FLAG("verbose", 'v', &sedopal_discovery_verbose,
+	OPT_FLAG("verbose", 'V', &sedopal_discovery_verbose,
 		"Print extended discovery information"),
 	OPT_FLAG("udev", 'u', &sedopal_discovery_udev,
 		"Print locking information in form suitable for udev rules"),
diff --git a/plugins/shannon/shannon-nvme.c b/plugins/shannon/shannon-nvme.c
index 448748953e..32ee8dc626 100644
--- a/plugins/shannon/shannon-nvme.c
+++ b/plugins/shannon/shannon-nvme.c
@@ -281,7 +281,7 @@ static int set_additional_feature(int argc, char **argv, struct command *acmd, s
 	NVME_ARGS(opts,
 		OPT_UINT("namespace-id", 'n', &cfg.namespace_id, namespace_id),
 		OPT_UINT("feature-id",	 'f', &cfg.feature_id,	 feature_id),
-		OPT_UINT("value",	 'v', &cfg.value,	 value),
+		OPT_UINT("value",	 'V', &cfg.value,	 value),
 		OPT_UINT("data-len",	 'l', &cfg.data_len,	 data_len),
 		OPT_FILE("data",	 'd', &cfg.file,	 data),
 		OPT_FLAG("save",	 's', &cfg.save,	 save));
diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c
index fc8ebad485..682a8d0708 100644
--- a/plugins/toshiba/toshiba-nvme.c
+++ b/plugins/toshiba/toshiba-nvme.c
@@ -428,7 +428,7 @@ static int vendor_log(int argc, char **argv, struct command *acmd, struct plugin
 
 	NVME_ARGS(opts,
 		OPT_UINT("namespace-id", 'n', &cfg.namespace_id, namespace),
-		OPT_FILE("output-file",  'o', &cfg.output_file,  output_file),
+		OPT_FILE("output-file",  'O', &cfg.output_file,  output_file),
 		OPT_UINT("log",          'l', &cfg.log,          log));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
@@ -474,7 +474,7 @@ static int internal_log(int argc, char **argv, struct command *acmd, struct plug
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file", 'o', &cfg.output_file, output_file),
+		OPT_FILE("output-file", 'O', &cfg.output_file, output_file),
 		OPT_FLAG("prev-log", 'p', &cfg.prev_log, prev_log));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
diff --git a/plugins/virtium/virtium-nvme.c b/plugins/virtium/virtium-nvme.c
index 732d3d508a..221797c15b 100644
--- a/plugins/virtium/virtium-nvme.c
+++ b/plugins/virtium/virtium-nvme.c
@@ -962,7 +962,7 @@ static int vt_save_smart_to_vtview_log(int argc, char **argv,
 	NVME_ARGS(opts,
 		OPT_DOUBLE("run-time",  'r', &cfg.run_time_hrs,             run_time),
 		OPT_DOUBLE("freq",      'f', &cfg.log_record_frequency_hrs, freq),
-		OPT_FILE("output-file", 'o', &cfg.output_file,              output_file),
+		OPT_FILE("output-file", 'O', &cfg.output_file,              output_file),
 		OPT_STRING("test-name", 'n', "NAME", &cfg.test_name,        test_name));
 
 	vt_generate_vtview_log_file_name(vt_default_log_file_name);
diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index 5f165480a5..42205e3589 100644
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -3922,7 +3922,7 @@ static int wdc_cap_diag(int argc, char **argv, struct command *acmd,
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file",   'o', &cfg.file,      file),
+		OPT_FILE("output-file",   'O', &cfg.file,      file),
 		OPT_UINT("transfer-size", 's', &cfg.xfer_size, size));
 
 	ret = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
@@ -4350,11 +4350,11 @@ static int wdc_vs_internal_fw_log(int argc, char **argv, struct command *acmd,
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file",   'o', &cfg.file,      file),
+		OPT_FILE("output-file",   'O', &cfg.file,      file),
 		OPT_UINT("transfer-size", 's', &cfg.xfer_size, size),
 		OPT_UINT("data-area",     'd', &cfg.data_area, data_area),
 		OPT_FILE("type",          't', &cfg.type,      type),
-		OPT_FLAG("verbose",       'v', &cfg.verbose,   verbose),
+		OPT_FLAG("verbose",       'V', &cfg.verbose,   verbose),
 		OPT_LONG("file-size",     'f', &cfg.file_size, file_size),
 		OPT_LONG("offset",        'e', &cfg.offset,    offset),
 		OPT_END());
@@ -4727,7 +4727,7 @@ static int wdc_drive_log(int argc, char **argv, struct command *acmd,
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file", 'o', &cfg.file, file));
+		OPT_FILE("output-file", 'O', &cfg.file, file));
 
 	ret = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 	if (ret)
@@ -4773,7 +4773,7 @@ static int wdc_get_crash_dump(int argc, char **argv, struct command *acmd,
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file", 'o', &cfg.file, file));
+		OPT_FILE("output-file", 'O', &cfg.file, file));
 
 	ret = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 	if (ret)
@@ -4814,7 +4814,7 @@ static int wdc_get_pfail_dump(int argc, char **argv, struct command *acmd,
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file", 'o', &cfg.file, file));
+		OPT_FILE("output-file", 'O', &cfg.file, file));
 
 	ret = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 	if (ret)
@@ -10513,7 +10513,7 @@ static int wdc_namespace_resize(int argc, char **argv,
 
 	NVME_ARGS(opts,
 		OPT_UINT("namespace-id", 'n', &cfg.namespace_id, namespace_id),
-		OPT_UINT("op-option", 'o', &cfg.op_option, op_option));
+		OPT_UINT("op-option", 'O', &cfg.op_option, op_option));
 
 	ret = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 	if (ret)
@@ -10573,7 +10573,7 @@ static int wdc_reason_identifier(int argc, char **argv,
 
 	NVME_ARGS(opts,
 		OPT_UINT("log-id", 'i', &cfg.log_id, log_id),
-		OPT_FILE("file",   'o', &cfg.file,   fname));
+		OPT_FILE("file",   'O', &cfg.file,   fname));
 
 	ret = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
 
@@ -12311,7 +12311,7 @@ static int wdc_enc_get_log(int argc, char **argv, struct command *acmd, struct p
 	};
 
 	NVME_ARGS(opts,
-		OPT_FILE("output-file",   'o', &cfg.file,  file),
+		OPT_FILE("output-file",   'O', &cfg.file,  file),
 		OPT_UINT("transfer-size", 's', &cfg.xfer_size, size),
 		OPT_UINT("log-id",        'l', &cfg.log_id, log));
 
diff --git a/plugins/zns/zns.c b/plugins/zns/zns.c
index 749b6d05e5..fa8b8f8809 100644
--- a/plugins/zns/zns.c
+++ b/plugins/zns/zns.c
@@ -187,7 +187,7 @@ static int id_ns(int argc, char **argv, struct command *acmd, struct plugin *plu
 
 	NVME_ARGS(opts,
 		OPT_UINT("namespace-id", 'n', &cfg.namespace_id,  namespace_id),
-		OPT_FLAG("vendor-specific", 'v', &cfg.vendor_specific, vendor_specific),
+		OPT_FLAG("vendor-specific", 'V', &cfg.vendor_specific, vendor_specific),
 		OPT_FLAG("human-readable", 'H', &cfg.human_readable, human_readable));
 
 	err = parse_and_open(&ctx, &hdl, argc, argv, desc, opts);
@@ -348,7 +348,7 @@ static int zone_mgmt_send(int argc, char **argv, struct command *acmd, struct pl
 	NVME_ARGS(opts,
 		OPT_UINT("namespace-id", 'n', &cfg.namespace_id,  namespace_id),
 		OPT_SUFFIX("start-lba",  's', &cfg.zslba,         zslba),
-		OPT_FLAG("zsaso",        'o', &cfg.zsaso,         zsaso),
+		OPT_FLAG("zsaso",        'O', &cfg.zsaso,         zsaso),
 		OPT_FLAG("select-all",   'a', &cfg.select_all,    select_all),
 		OPT_BYTE("zsa",          'z', &cfg.zsa,           zsa),
 		OPT_UINT("data-len",     'l', &cfg.data_len,      data_len),
@@ -776,7 +776,7 @@ static int report_zones(int argc, char **argv, struct command *acmd, struct plug
 		OPT_SUFFIX("start-lba",   's', &cfg.zslba,          zslba),
 		OPT_UINT("descs",         'd', &cfg.num_descs,      num_descs),
 		OPT_UINT("state",         'S', &cfg.state,          state),
-		OPT_FLAG("verbose",       'v', &cfg.verbose,        verbose),
+		OPT_FLAG("verbose",       'V', &cfg.verbose,        verbose),
 		OPT_FLAG("extended",      'e', &cfg.extended,       ext),
 		OPT_FLAG("partial",       'p', &cfg.partial,        part));
 
diff --git a/unit/test-argconfig-parse.c b/unit/test-argconfig-parse.c
index e1e4073ccc..cc4bbe6701 100644
--- a/unit/test-argconfig-parse.c
+++ b/unit/test-argconfig-parse.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "../util/argconfig.h"
 #include "../util/cleanup.h"
@@ -212,6 +213,213 @@ void comma_sep_array_test(const struct comma_sep_array_test *test)
 	}
 }
 
+struct global_cfg {
+	int verbose;
+	bool dry_run;
+};
+
+static struct global_cfg gcfg;
+
+struct global_parse_test {
+	const char *desc;
+	char *argv[8];
+	int argc;
+	/*
+	 * Expected optind value after argconfig_parse_global() returns.
+	 * This is the index of the first non-option argument (the subcommand)
+	 * in argv, as seen by getopt – i.e. 1-based because getopt always
+	 * skips argv[0] as the program name.
+	 */
+	int expected_optind;
+	int expected_ret;
+	int expected_verbose;
+	bool expected_dry_run;
+	const char *stderr_must_not_contain;
+};
+
+static const struct global_parse_test global_parse_tests[] = {
+	{
+		"no global opts: subcommand only",
+		{"prog", "list"},
+		2, 1, 0, 0, false,
+	},
+	{
+		"short -v before subcommand",
+		{"prog", "-v", "list"},
+		3, 2, 0, 1, false,
+	},
+	{
+		"long --verbose before subcommand",
+		{"prog", "--verbose", "list"},
+		3, 2, 0, 1, false,
+	},
+	{
+		"two -v flags before subcommand",
+		{"prog", "-v", "-v", "list"},
+		4, 3, 0, 2, false,
+	},
+	{
+		"--dry-run before subcommand",
+		{"prog", "--dry-run", "list"},
+		3, 2, 0, 0, true,
+	},
+	{
+		"multiple global opts before subcommand",
+		{"prog", "-v", "--dry-run", "list"},
+		4, 3, 0, 1, true,
+	},
+	{
+		/*
+		 * The '+' prefix in the short-opts string causes getopt to stop
+		 * at the first non-option argument.  Global opts that appear
+		 * *after* the subcommand must be left for the subcommand's own
+		 * argconfig_parse() call to handle.
+		 */
+		"subcommand before option: stop at first non-option",
+		{"prog", "list", "-v"},
+		3, 1, 0, 0, false,
+	},
+	{
+		"only program name",
+		{"prog"},
+		1, 1, 0, 0, false,
+	},
+	{
+		"option with no following subcommand",
+		{"prog", "--verbose"},
+		2, 2, 0, 1, false,
+	},
+	{
+		"--help does not trigger unrecognized-option error",
+		{"prog", "--help"},
+		2, 2, 0, 0, false,
+		"unrecognized option '--help'",
+	},
+	{
+		"--version does not trigger unrecognized-option error",
+		{"prog", "--version"},
+		2, 1, 0, 0, false,
+		"unrecognized option '--version'",
+	},
+};
+
+static int parse_global_capture_stderr(int argc, char *argv[],
+				       struct argconfig_commandline_options *opts,
+				       char *buf, size_t buf_size)
+{
+	FILE *tmp = NULL;
+	int ret;
+	int saved_stderr;
+	size_t n;
+
+	tmp = tmpfile();
+	if (!tmp) {
+		printf("ERROR: tmpfile failed: %s\n", libnvme_strerror(errno));
+		test_rc = 1;
+		return -errno;
+	}
+
+	saved_stderr = dup(STDERR_FILENO);
+	if (saved_stderr < 0) {
+		printf("ERROR: dup stderr failed: %s\n", libnvme_strerror(errno));
+		test_rc = 1;
+		fclose(tmp);
+		return -errno;
+	}
+
+	fflush(stderr);
+	if (dup2(fileno(tmp), STDERR_FILENO) < 0) {
+		printf("ERROR: redirect stderr failed: %s\n", libnvme_strerror(errno));
+		close(saved_stderr);
+		test_rc = 1;
+		fclose(tmp);
+		return -errno;
+	}
+
+	ret = argconfig_parse_global(argc, argv, opts);
+	fflush(stderr);
+
+	if (fseek(tmp, 0, SEEK_SET) != 0) {
+		printf("ERROR: rewind captured stderr failed: %s\n",
+		       libnvme_strerror(errno));
+		close(saved_stderr);
+		test_rc = 1;
+		fclose(tmp);
+		return -errno;
+	}
+
+	n = fread(buf, 1, buf_size - 1, tmp);
+	buf[n] = '\0';
+
+	if (dup2(saved_stderr, STDERR_FILENO) < 0) {
+		printf("ERROR: restoring stderr failed: %s\n", libnvme_strerror(errno));
+		test_rc = 1;
+		close(saved_stderr);
+		fclose(tmp);
+		return -errno;
+	}
+	close(saved_stderr);
+	fclose(tmp);
+
+	return ret;
+}
+
+static void do_global_parse_test(const struct global_parse_test *test)
+{
+	int ret;
+	char stderr_buf[512] = "";
+
+	OPT_ARGS(opts) = {
+		OPT_INCR("verbose", 'v', &gcfg.verbose, "increase verbosity"),
+		OPT_FLAG("dry-run", 0, &gcfg.dry_run, "dry run mode"),
+		OPT_END()
+	};
+
+	gcfg.verbose = 0;
+	gcfg.dry_run = false;
+
+	if (test->stderr_must_not_contain)
+		ret = parse_global_capture_stderr(test->argc, (char **)test->argv,
+						  opts, stderr_buf, sizeof(stderr_buf));
+	else
+		ret = argconfig_parse_global(test->argc, (char **)test->argv, opts);
+
+	if (ret != test->expected_ret) {
+		printf("ERROR: global_parse {%s}: ret=%d expected=%d\n",
+		       test->desc, ret, test->expected_ret);
+		test_rc = 1;
+		return;
+	}
+
+	if (optind != test->expected_optind) {
+		printf("ERROR: global_parse {%s}: optind=%d expected=%d\n",
+		       test->desc, optind, test->expected_optind);
+		test_rc = 1;
+		return;
+	}
+
+	if (test->stderr_must_not_contain &&
+	    strstr(stderr_buf, test->stderr_must_not_contain)) {
+		printf("ERROR: global_parse {%s}: stderr unexpectedly contains '%s'\n",
+		       test->desc, test->stderr_must_not_contain);
+		test_rc = 1;
+		return;
+	}
+
+	if (gcfg.verbose != test->expected_verbose) {
+		printf("ERROR: global_parse {%s}: verbose=%d expected=%d\n",
+		       test->desc, gcfg.verbose, test->expected_verbose);
+		test_rc = 1;
+		return;
+	}
+
+	if (gcfg.dry_run != test->expected_dry_run) {
+		printf("ERROR: global_parse {%s}: dry_run=%d expected=%d\n",
+		       test->desc, gcfg.dry_run, test->expected_dry_run);
+		test_rc = 1;
+	}
+}
+
 int main(void)
 {
 	unsigned int i;
@@ -229,6 +437,9 @@ int main(void)
 	for (i = 0; i < ARRAY_SIZE(comma_sep_array_tests); i++)
 		comma_sep_array_test(&comma_sep_array_tests[i]);
 
+	for (i = 0; i < ARRAY_SIZE(global_parse_tests); i++)
+		do_global_parse_test(&global_parse_tests[i]);
+
 	if (f)
 		fclose(f);
 
diff --git a/util/argconfig.c b/util/argconfig.c
index 5e74548270..03c9420372 100644
--- a/util/argconfig.c
+++ b/util/argconfig.c
@@ -129,6 +129,14 @@ static void show_option(const struct argconfig_commandline_options *option)
 void argconfig_print_help(const char *program_desc,
 			  struct argconfig_commandline_options *s)
 {
+	/*
+	 * Default section name used when options appear before the first
+	 * OPT_GROUP separator.  This fallback is not reached for NVME_ARGS()
+	 * option arrays which always begin with an OPT_GROUP entry.
+	 */
+	const char *pending_header = "Options";
+	bool header_printed = false;
+
 	fprintf(stderr, "\033[1mUsage: %s\033[0m\n\n",
 		append_usage_str);
 
@@ -138,9 +146,18 @@ void argconfig_print_help(const char *program_desc,
 	if (!s || !s->option)
 		return;
 
-	fprintf(stderr, "\n\033[1mOptions:\033[0m\n");
-	for (; s->option; s++)
+	for (; s->option; s++) {
+		if (s->config_type == CFG_GROUP_SEPARATOR) {
+			pending_header = s->help;
+			header_printed = false;
+			continue;
+		}
+		if (!header_printed) {
+			fprintf(stderr, "\n\033[1m%s:\033[0m\n", pending_header);
+			header_printed = true;
+		}
 		show_option(s);
+	}
 }
 
 static int argconfig_error(char *type, const char *opt, const char *arg)
@@ -214,6 +231,8 @@ static int argconfig_parse_type(struct argconfig_commandline_options *s)
 	case CFG_FLAG:
 		*(bool *)value = true;
 		break;
+	case CFG_GROUP_SEPARATOR:
+		break;
 	}
 
 	return ret;
@@ -252,6 +271,8 @@ static void argconfig_set_opt_val(enum argconfig_types type, union argconfig_val
 	case CFG_STRING:
 		*(char **)val = opt_val->string;
 		break;
+	case CFG_GROUP_SEPARATOR:
+		break;
 	}
 }
 
@@ -305,8 +326,9 @@ int argconfig_parse(int argc, char *argv[], const char *program_desc,
 {
 	__cleanup_free char *short_opts = NULL;
 	__cleanup_free struct option *long_opts = NULL;
+	__cleanup_free int *long_opt_map = NULL;
 	struct argconfig_commandline_options *s;
-	int c, option_index = 0, short_index = 0, options_count = 0;
+	int c, long_opt_index = 0, opt_index = 0, short_index = 0, options_count = 0;
 	int ret = 0;
 
 	errno = 0;
@@ -315,13 +337,17 @@ int argconfig_parse(int argc, char *argv[], const char *program_desc,
 
 	long_opts = calloc(options_count + 2, sizeof(struct option));
 	short_opts = calloc(options_count * 3 + 3, sizeof(*short_opts));
+	long_opt_map = calloc(options_count + 2, sizeof(*long_opt_map));
 
-	if (!long_opts || !short_opts) {
+	if (!long_opts || !short_opts || !long_opt_map) {
 		fprintf(stderr, "failed to allocate memory for opts: %s\n", libnvme_strerror(errno));
 		return -errno;
 	}
 
-	for (s = options; s->option; s++) {
+	for (s = options, opt_index = 0; s->option; s++, opt_index++) {
+		s->seen = false;
+		if (s->config_type == CFG_GROUP_SEPARATOR)
+			continue;
 		if (s->short_option) {
 			short_opts[short_index++] = s->short_option;
 			if (s->argument_type == required_argument ||
@@ -331,36 +357,38 @@ int argconfig_parse(int argc, char *argv[], const char *program_desc,
 				short_opts[short_index++] = ':';
 		}
 		if (!is_null_or_empty(s->option)) {
-			long_opts[option_index].name = s->option;
-			long_opts[option_index].has_arg = s->argument_type;
+			long_opts[long_opt_index].name = s->option;
+			long_opts[long_opt_index].has_arg = s->argument_type;
+			long_opt_map[long_opt_index] = opt_index;
+			long_opt_index++;
 		}
-		s->seen = false;
-		option_index++;
 	}
 
-	long_opts[option_index].name = "help";
-	long_opts[option_index].val = 'h';
+	long_opts[long_opt_index].name = "help";
+	long_opts[long_opt_index].val = 'h';
 
 	short_opts[short_index++] = '?';
 	short_opts[short_index] = 'h';
 
 	optind = 0;
-	while ((c = getopt_long_only(argc, argv, short_opts, long_opts, &option_index)) != -1) {
+	while ((c = getopt_long_only(argc, argv, short_opts, long_opts, &long_opt_index)) != -1) {
 		if (c) {
 			if (c == '?' || c == 'h') {
 				argconfig_print_help(program_desc, options);
 				ret = -EINVAL;
 				break;
 			}
-			for (option_index = 0; option_index < options_count; option_index++) {
-				if (c == options[option_index].short_option)
+			for (opt_index = 0; opt_index < options_count; opt_index++) {
+				if (c == options[opt_index].short_option)
 					break;
 			}
-			if (option_index == options_count)
+			if (opt_index == options_count)
 				continue;
+		} else {
+			opt_index = long_opt_map[long_opt_index];
 		}
 
-		s = &options[option_index];
+		s = &options[opt_index];
 		s->seen = true;
 
 		if (!s->default_value)
@@ -377,6 +405,103 @@ int argconfig_parse(int argc, char *argv[], const char *program_desc,
 	return ret;
 }
 
+/*
+ * Parse global (pre-subcommand) options from argc/argv. Stops at the first
+ * non-option argument (i.e. the subcommand name) so that subcommand-specific
+ * options are left in place for the subcommand dispatcher. After a successful
+ * call, optind points to the first non-option argument (the subcommand).
+ *
+ * Returns 0 on success, negative errno on failure.
+ */
+int argconfig_parse_global(int argc, char *argv[],
+			   struct argconfig_commandline_options *options)
+{
+	__cleanup_free char *short_opts = NULL;
+	__cleanup_free struct option *long_opts = NULL;
+	__cleanup_free int *long_opt_map = NULL;
+	struct argconfig_commandline_options *s;
+	int c, long_opt_index = 0, opt_index = 0, short_index = 0, options_count = 0;
+	int ret = 0;
+
+	errno = 0;
+	for (s = options; s->option; s++)
+		options_count++;
+
+	long_opts = calloc(options_count + 2, sizeof(struct option));
+	/* '+' prefix: stop at the first non-option argument (the subcommand) */
+	short_opts = calloc(options_count * 3 + 4, sizeof(*short_opts));
+	long_opt_map = calloc(options_count + 2, sizeof(*long_opt_map));
+
+	if (!long_opts || !short_opts || !long_opt_map) {
+		fprintf(stderr, "failed to allocate memory for opts: %s\n", libnvme_strerror(errno));
+		return -errno;
+	}
+
+	short_opts[short_index++] = '+';
+
+	for (s = options, opt_index = 0; s->option; s++, opt_index++) {
+		s->seen = false;
+		if (s->config_type == CFG_GROUP_SEPARATOR)
+			continue;
+		if (s->short_option) {
+			short_opts[short_index++] = s->short_option;
+			if (s->argument_type == required_argument ||
+			    s->argument_type == optional_argument)
+				short_opts[short_index++] = ':';
+			if (s->argument_type == optional_argument)
+				short_opts[short_index++] = ':';
+		}
+		if (!is_null_or_empty(s->option)) {
+			long_opts[long_opt_index].name = s->option;
+			long_opts[long_opt_index].has_arg = s->argument_type;
+			long_opt_map[long_opt_index] = opt_index;
+			long_opt_index++;
+		}
+	}
+
+	long_opts[long_opt_index].name = "help";
+	long_opts[long_opt_index].val = 'h';
+	long_opt_index++;
+
+	long_opts[long_opt_index].name = "version";
+	long_opts[long_opt_index].val = 'V';
+
+	short_opts[short_index++] = 'h';
+
+	optind = 0;
+	while ((c = getopt_long(argc, argv, short_opts, long_opts, &long_opt_index)) != -1) {
+		if (c == '?' || c == 'h')
+			break;
+		if (c == 'V') {
+			optind--;
+			break;
+		}
+
+		if (c) {
+			for (opt_index = 0; opt_index < options_count; opt_index++) {
+				if (c == options[opt_index].short_option)
+					break;
+			}
+			if (opt_index == options_count)
+				continue;
+		} else {
+			opt_index = long_opt_map[long_opt_index];
+		}
+
+		s = &options[opt_index];
+		s->seen = true;
+
+		if (!s->default_value)
+			continue;
+
+		ret = argconfig_parse_val(s);
+		if (ret)
+			break;
+	}
+
+	return ret;
+}
+
 #define DEFINE_ARGCONFIG_PARSE_COMMA_SEP_ARRAY_FUNC(name, ret_t, ret_max) \
 int argconfig_parse_comma_sep_array ## name(char *string,		\
 					    ret_t *val,			\
diff --git a/util/argconfig.h b/util/argconfig.h
index f27a20b3f6..407c703a92 100644
--- a/util/argconfig.h
+++ b/util/argconfig.h
@@ -54,6 +54,7 @@ enum argconfig_types {
 	CFG_SHORT,
 	CFG_POSITIVE,
 	CFG_INCREMENT,
+	CFG_GROUP_SEPARATOR,
 };
 
 #define OPT_ARGS(n) \
@@ -61,6 +62,9 @@ enum argconfig_types {
 
 #define OPT_END() { NULL }
 
+#define OPT_GROUP(d) \
+	{"", 0, NULL, CFG_GROUP_SEPARATOR, NULL, no_argument, d, false, NULL}
+
 #define OPT_FLAG(l, s, v, d, ...) \
 	{l, s, NULL, CFG_FLAG, v, no_argument, d, false, __VA_ARGS__}
 
@@ -175,6 +179,8 @@ void argconfig_print_help(const char *program_desc,
 			  struct argconfig_commandline_options *options);
 int argconfig_parse(int argc, char *argv[], const char *program_desc,
 		    struct argconfig_commandline_options *options);
+int argconfig_parse_global(int argc, char *argv[],
+			   struct argconfig_commandline_options *options);
 int argconfig_parse_comma_sep_array(char *string, int *ret, unsigned int max_length);
 int argconfig_parse_comma_sep_array_short(char *string, unsigned short *ret,
 					  unsigned int max_length);