ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/vagrant: Remove support for spdk-5.0.0 fork ns config

Browse Source 
But leave the shortcut for configuring nvme with a single namespace.

Change-Id: I0e5745db481b24ab813ec1e98426d709cde216fd
Signed-off-by: Michal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17769
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
This commit is contained in:
Michal Berger 2023-04-25 12:38:18 +02:00 committed by David Ko
parent df90fdb9c2
commit 4456a3b8da
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/vagrant/Vagrantfile vendored
View File

@ -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] != ""