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

scripts/vagrant: Remove OCSSD support from vagrant configuration

Browse Source 
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ifdd1d02b466b6496469c9ea1f09633b6e368ab57
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9617
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-09-24 12:44:25 +02:00 committed by Tomasz Zawadzki
parent b8d2b705dd
commit 8a0fedf4e6
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/vagrant/Vagrantfile vendored
View File

@ -164,21 +164,6 @@ def setup_nvme_disk(libvirt, disk, index)
end
end
def setup_ocssd_disk(libvirt, disk, index)
nvme_disk_id = disk + '-' + index.to_s
nvme_disk = get_nvme_disk(disk, index)
libvirt.qemuargs :value => "-drive"
libvirt.qemuargs :value => "format=raw,file=#{nvme_disk},if=none,id=#{nvme_disk_id}"
libvirt.qemuargs :value => "-device"
# create ocssd drive with special parameters
# lba_index=4 it is LBA namespace format, 4 means that block size is 4K and have 64B metadata
# lnum_lun, lnum_pln, lpgs_per_blk, lsecs_per_pg, lblks_per_pln this are parameters describing the device geometry
# we need to multiply these parameters by ourselves to have backend file minimal size:
# in our case: 4K * 8 * 2 * 1536 * 2 * 45 = 8640 MB
libvirt.qemuargs :value => "nvme,drive=#{nvme_disk_id},serial=deadbeef,oacs=0,namespaces=1,lver=2,lba_index=4,mdts=10,lnum_lun=8,lnum_pln=2,lpgs_per_blk=1536,lsecs_per_pg=2,lblks_per_pln=45,metadata=#{nvme_disk}_ocssd_md,nsdatafile=#{nvme_disk}_ocssd_blknvme.ns,laer_thread_sleep=3000,stride=4"
end
def setup_ssh(config)
config.ssh.forward_agent = true
config.ssh.forward_x11 = true
@ -268,8 +253,6 @@ def setup_libvirt(config, vmcpu, vmram, distro)
emulated_nvme_types.each_with_index { |disk, index|
if disk == "nvme"
setup_nvme_disk(libvirt, disk, index)
elsif disk == "ocssd"
setup_ocssd_disk(libvirt, disk, index)
end
}

5
scripts/vagrant/create_vbox.sh
View File

@ -31,7 +31,7 @@ display_help() {
echo " NVMe with 1 namespace and assumes path: /var/lib/libvirt/images/nvme_disk.img"
echo " -b option can be used multiple times for attaching multiple files to the VM"
echo " Parameters for -b option: <path>,<type>,<namespaces>,<cmb>,<pmr_file[:pmr_size]>"
echo " Available types: nvme, ocssd."
echo " Available types: nvme"
echo " Default pmr size: 16M"
echo " Default cmb: false"
echo " -c Create all above disk, default 0"
@ -56,8 +56,7 @@ display_help() {
echo " $0 -rv freebsd"
echo " $0 fedora33"
echo " $0 -b /var/lib/libvirt/images/nvme1.img,nvme,1 fedora33"
echo " $0 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora33"
echo " $0 -b /var/lib/libvirt/images/nvme5.img,nvme,5 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora33"
echo " $0 -b /var/lib/libvirt/images/nvme5.img,nvme,5 fedora33"
echo
}