From 357c9580a13fea3df6753fcbc8fb4a0e8cb5c518 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Fri, 11 Sep 2020 10:44:18 +0200 Subject: [PATCH] scripts/vagrant: fix namespace condition There should be no Qemu param "namespace" added for emulated nvme drive (i.e. default should be used). This condition was faulty because ENV variable storing this information is a text and we check for != 1 as for and integer. Change-Id: Ic87aadbbc7eb1ba1ec700bccdb8864726a6562e1 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4159 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto Reviewed-by: Pawel Piatek Reviewed-by: Mellanox Build Bot --- scripts/vagrant/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index 76b3fb320..f9ddf7a98 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -150,7 +150,7 @@ def setup_nvme_disk(libvirt, disk, index) libvirt.qemuargs :value => "format=raw,file=#{nvme_disk},if=none,id=#{nvme_disk_id}" libvirt.qemuargs :value => "-device" nvme_drive = "nvme,drive=#{nvme_disk_id},serial=1234#{index}" - if !nvme_namespaces[index].nil? && nvme_namespaces[index] != 1 + if !nvme_namespaces[index].nil? && nvme_namespaces[index] != "1" nvme_drive << ",namespaces=#{nvme_namespaces[index]}" end