From a5c3f72a897e801f1c17eaccc031a44a59bd430f Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 9 Jun 2021 11:18:59 +0200 Subject: [PATCH] scripts/vagrant: Initialize pmr_cmdline as an empty string 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 Change-Id: Ib41da699dcc2f213f0b18d21be3fd32f398bae41 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8216 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- scripts/vagrant/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index aab518e83..f35adbf63 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -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