d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts/vagrant: Allow to mix CMB and PMR setup

Browse Source 
As of latest qemu (>= 6.0.0) these can now be used together as
different BARs are used to accommodate for both.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Icf32f491fd33ef733f0d946f9b5caaeb87137d28
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8217
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2021-06-09 11:29:10 +02:00 committed by Tomasz Zawadzki
parent a5c3f72a89
commit 1347830beb
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/vagrant/Vagrantfile vendored
View File

@ -140,18 +140,13 @@ def setup_nvme_disk(libvirt, disk, index)
nvme_drive << ",namespaces=#{nvme_namespaces[index]}"
end
cmb_set = "false"
pmr_cmdline = ""
if !nvme_cmbs[index].nil? && nvme_cmbs[index] == "true"
# Fix the size of the buffer to 128M
nvme_drive << ",cmb_size_mb=128"
cmb_set = "true"
end
if !nvme_pmrs[index].nil?
if cmb_set == "true"
abort("CMB and PMR are mutually exclusive, aborting (#{nvme_disk})")
end
pmr_path, pmr_size = nvme_pmrs[index].split(':')
if !File.exist?(pmr_path)
abort("#{pmr_path} does not exist, aborting")