From 1347830beb08af0028a7cd67d2cbaca2008e84a5 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 9 Jun 2021 11:29:10 +0200 Subject: [PATCH] scripts/vagrant: Allow to mix CMB and PMR setup As of latest qemu (>= 6.0.0) these can now be used together as different BARs are used to accommodate for both. Signed-off-by: Michal Berger Change-Id: Icf32f491fd33ef733f0d946f9b5caaeb87137d28 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8217 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- scripts/vagrant/Vagrantfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index f35adbf63..1093eb599 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -140,18 +140,13 @@ def setup_nvme_disk(libvirt, disk, index) nvme_drive << ",namespaces=#{nvme_namespaces[index]}" end - cmb_set = "false" pmr_cmdline = "" if !nvme_cmbs[index].nil? && nvme_cmbs[index] == "true" # Fix the size of the buffer to 128M nvme_drive << ",cmb_size_mb=128" - cmb_set = "true" end if !nvme_pmrs[index].nil? - if cmb_set == "true" - abort("CMB and PMR are mutually exclusive, aborting (#{nvme_disk})") - end pmr_path, pmr_size = nvme_pmrs[index].split(':') if !File.exist?(pmr_path) abort("#{pmr_path} does not exist, aborting")