From c90dac7a6e33ef4b044c4e74107bec077b81f322 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 14 Oct 2020 11:36:10 +0200 Subject: [PATCH] scripts/setup: Gracefully handle contigmem status Change-Id: Id59b02f08fb093dfc016bd49b9d5073807831040 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4657 Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris --- scripts/setup.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index e8b897bc7..940189573 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -601,14 +601,23 @@ function status_freebsd() { ) local contigmem=present + local contigmem_buffer_size + local contigmem_num_buffers + if ! kldstat -q -m contigmem; then contigmem="not present" fi + if ! contigmem_buffer_size=$(kenv hw.contigmem.buffer_size 2> /dev/null); then + contigmem_buffer_size="not set" + fi + if ! contigmem_num_buffers=$(kenv hw.contigmem.num_buffers 2> /dev/null); then + contigmem_num_buffers="not set" + fi cat <<- BSD_INFO Contigmem ($contigmem) - Buffer Size: $(kenv hw.contigmem.buffer_size) - Num Buffers: $(kenv hw.contigmem.num_buffers) + Buffer Size: $contigmem_buffer_size + Num Buffers: $contigmem_num_buffers NVMe devices $(status_print "${!nvme_d[@]}")