From e9d44aa39b1b2fc72bdc18e96dd520b6d0eced44 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 25 Apr 2023 12:38:18 +0200 Subject: [PATCH] scripts/vagrant: Remove support for spdk-5.0.0 fork ns config But leave the shortcut for configuring nvme with a single namespace. Change-Id: I0e5745db481b24ab813ec1e98426d709cde216fd Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17769 Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Pawel Piatek --- scripts/vagrant/Vagrantfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index 94d53da07..55e1fab7c 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -160,15 +160,10 @@ def setup_nvme_disk(libvirt, disk, index) namespace_disks = namespace_disks + nvme_disk.split() elsif !nvme_namespaces[index].nil? && !nvme_namespaces[index].match(/^[0-9]+$/) namespace_disks = namespace_disks + nvme_disk.split() + nvme_namespaces[index].split(':') - elsif !nvme_namespaces[index].nil? && nvme_namespaces[index].match(/^[0-9]+$/) - # Compatibility with spdk-5.0.0 fork + elsif !nvme_namespaces[index].nil? && nvme_namespaces[index] == "1" libvirt.qemuargs :value => "-drive" libvirt.qemuargs :value => "format=raw,file=#{nvme_disk},if=none,id=#{nvme_disk_id}" - if nvme_namespaces[index] == "1" nvme_controller <<",drive=#{nvme_disk_id}" - else - nvme_controller <<",namespaces=#{nvme_namespaces[index]},drive=#{nvme_disk_id}" - end end if !nvme_cmbs[index].nil? && nvme_cmbs[index] != ""