From ea9ee84ba6b7782c151591687a6852ae46a4e171 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 24 Sep 2021 12:44:25 +0200 Subject: [PATCH] scripts/vagrant: Remove OCSSD support from vagrant configuration Signed-off-by: Michal Berger Change-Id: Ifdd1d02b466b6496469c9ea1f09633b6e368ab57 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9617 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris --- scripts/vagrant/Vagrantfile | 17 ----------------- scripts/vagrant/create_vbox.sh | 5 ++--- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index 98222d0c7..bc51425db 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -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 } diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh index 359728892..02a19af05 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -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: ,,,," - 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 }