Commit a5c3f72a authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

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: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: Ib41da699dcc2f213f0b18d21be3fd32f398bae41
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8216


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 22d7d62e

scripts/vagrant/Vagrantfile

+2 −2
Original line number Diff line number Diff line
@@ -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