From 4fb0b89625c43951da958c37e6f5e3687bd8dca6 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 26 Feb 2021 07:34:40 -0500 Subject: [PATCH] lib/env: remove deprecated fields from spdk_env_opts The fields were deprecated in SPDK 21.01. Signed-off-by: Tomasz Zawadzki Change-Id: If6b946024bf1ce4c106cdf493bcb5662a3b21b13 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6592 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker --- CHANGELOG.md | 2 ++ include/spdk/env.h | 15 +++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e8254753..e256a5e33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ Only one OCSSD bdev can be created for one OCSSD namespace. Added spdk_pci_device_allow API to allow applications to add PCI addresses to the allowed list after the application has started. +Removed the `pci_whitelist`, `pci_blacklist` and `master_core` members of struct `spdk_env_opts`. + ### accel Two new accelerated crc32 functions 'spdk_accel_submit_crc32cv' and diff --git a/include/spdk/env.h b/include/spdk/env.h index 4940f52ab..c5ae5d863 100644 --- a/include/spdk/env.h +++ b/include/spdk/env.h @@ -76,24 +76,15 @@ struct spdk_env_opts { const char *core_mask; int shm_id; int mem_channel; - union { - int main_core; - int master_core __attribute__((deprecated)); - }; + int main_core; int mem_size; bool no_pci; bool hugepage_single_segments; bool unlink_hugepage; size_t num_pci_addr; const char *hugedir; - union { - struct spdk_pci_addr *pci_blocked; - struct spdk_pci_addr *pci_blacklist __attribute__((deprecated)); - }; - union { - struct spdk_pci_addr *pci_allowed; - struct spdk_pci_addr *pci_whitelist __attribute__((deprecated)); - }; + struct spdk_pci_addr *pci_blocked; + struct spdk_pci_addr *pci_allowed; const char *iova_mode; uint64_t base_virtaddr;