I (think) address all the feedback I got from Sagi and Shinichiro except one. The _have_nvme_cli_context() (previously _nvme_cli_support_context()) function is still there. I didn't find any other good way to achieve this and I found in blktests another function doing the same: _have_fio_zbd_zonemode(). Daniel changes: v2: - nvme/048: - untaggle waiting for state change and queue count check - make all variables local - compare numbers not strings - nvme/rc: - rename _nvme_cli_supports_context to _have_nvme_cli_context - only add --context for fc - reordered setup/cleanup - nvme/{041,042,043,044,045,048}: - move all changes related to this patch v1: - https://lore.kernel.org/linux-nvme/20230620132703.20648-1-dwagner@xxxxxxx/ Daniel Wagner (3): nvme/048: Check for queue count check directly nvme/rc: Avoid triggering host nvme-cli autoconnect nvme/{041,042,043,044,045,048}: Use default hostnqn and hostid tests/nvme/041 | 8 ++--- tests/nvme/042 | 8 ++--- tests/nvme/043 | 8 ++--- tests/nvme/044 | 8 ++--- tests/nvme/045 | 8 ++--- tests/nvme/048 | 32 +++++++++++++------- tests/nvme/rc | 81 +++++++++++++++++++++++++++++++++++++++++++------- 7 files changed, 103 insertions(+), 50 deletions(-) -- 2.41.0