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

scripts/vagrant: Initialize pmr_cmdline as an empty string

Browse Source 
Having pmr_cmdline set to nil was for some reason breaking cmb setup
as weirdly enough pmr_cmdline was ending up being set to "true".
Avoid this by having pmr_cmdline set to some value, empty string in
this case.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ib41da699dcc2f213f0b18d21be3fd32f398bae41
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8216
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:18:59 +02:00 committed by Tomasz Zawadzki
parent 22d7d62efb
commit a5c3f72a89
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/vagrant/Vagrantfile vendored
View File

@ -141,7 +141,7 @@ def setup_nvme_disk(libvirt, disk, index)
end
cmb_set = "false"
pmr_cmdline =
pmr_cmdline = ""
if !nvme_cmbs[index].nil? && nvme_cmbs[index] == "true"
# Fix the size of the buffer to 128M
@ -163,7 +163,7 @@ def setup_nvme_disk(libvirt, disk, index)
pmr_cmdline = "memory-backend-file,id=pmr#{index},share=on,mem-path=#{pmr_path},size=#{pmr_size}"
end
libvirt.qemuargs :value => nvme_drive
if !pmr_cmdline.nil?
if pmr_cmdline != ""
libvirt.qemuargs :value => "-object"
libvirt.qemuargs :value => pmr_cmdline
end