Commit 4b481146 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

scripts/vagrant: Be more specific in ms setup 



Change-Id: Ic3b617ff40d246e4af13032a70cff943acf3dde3
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17979


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent b3487cb7

scripts/vagrant/Vagrantfile

+4 −1
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ def setup_nvme_disk(libvirt, disk, index) 
  nvme_controller = ""

  fdp_subsys = ""

  fdp_subsys_id = ""

  ms = ""



  # Define controller

  nvme_controller = "nvme,id=#{nvme_disk_id},serial=1234#{index}"
@@ -216,7 +217,9 @@ def setup_nvme_disk(libvirt, disk, index) 
      next

    end

    zoned = nvme_zns[index].nil? ? "false" : "true"

    ms = nvme_ms[index].nil? ? "" : ",ms=64"

    if ! nvme_ms[index].nil? && nvme_ms[index] == "true"

        ms = ",ms=64"

    end

    ns = "nvme-ns,drive=#{nvme_disk_id}-drive#{nsid},bus=#{nvme_disk_id},nsid=#{nsid + 1},zoned=#{zoned},logical_block_size=4096,physical_block_size=4096#{ms}"

    if !fdp_ruhs.nil? && !fdp_ruhs[nsid].nil? && fdp_ruhs[nsid] != ""

        ns << ",fdp.ruhs=#{fdp_ruhs[nsid]}"

scripts/vagrant/create_vbox.sh

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ display_help() { 
	echo "                                  Default pmr size: 16M"

	echo "                                  Default cmb: false"

	echo "                                  Default zns: false"

	echo "                                  Default ms: none"

	echo "                                  Default ms: none (set to 'true' to enable 64M)"

	echo "                                  Default fdp: 96M:2:8[:1;2;3:1...] (fdp.runs:fdp.nrg:fdp.nruh:fdp.ruhs)"

	echo "                                  type, ns_path, cmb, pmr, zns, ms  and fdp can be empty"

	echo "                                  fdp.ruhs defines fdp.ruhs per ns, e.g.: 4;5;6:1 would set 4;5;6 for ns=1,"