From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 57687A04B6;
Tue, 22 Sep 2020 16:32:25 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0D2A11D5A6;
Tue, 22 Sep 2020 16:32:12 +0200 (CEST)
Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com
[209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 02E4D1D55B
for <dev@dpdk.org>; Tue, 22 Sep 2020 16:32:08 +0200 (CEST)
Received: by mail-pj1-f67.google.com with SMTP id v14so1541728pjd.4
for <dev@dpdk.org>; Tue, 22 Sep 2020 07:32:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=0TbI9fMtROiIomF5eju15hGV5EVwPtNaT7DvXXNkOvQ=;
b=Ez41WuR6tNXNvSac6tTYA1RQw9VKun+ux034F8+XCxygrscZTk6P/Bvjq2dH+c5Nsb
wYMX445uhGIbzBT8rGzzWiJi/fATvj0BAMRhn2J8LZBUBThsfwil0aDeD43Nb7a9WQYj
0AtFgnJk3BEgbR04JKRLY7JxGBbk5ZKuu8HSaI1tGzn1B2xMWOMWUcv+rQD9ChO/y7au
wbP1IeXv/u2rQMB514Ob+sDVNYwoRKc8L5co6GSvXY8PWyOwDMhwaSwLwxHJdRbLz1aM
lrkasj4cNseRRBlfp6vJIm8WZfapGABYh3WpVwEVoGbcbUsZ1WfOf2LVDgzf81L8X5pn
PUkA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=0TbI9fMtROiIomF5eju15hGV5EVwPtNaT7DvXXNkOvQ=;
b=Pl397dJlQzFzEiVldO22/C7HxOccJICDCypNADb6GZgC0TyYpL9iLsakx91usG+pso
1nYqV+R0acBJmgfbv3PPJUwQnmZhQQhiTJ9Z0TrQsV4CDBz2TPax/RVustVjb0fyve3Q
ciSAA9hZxMWpzzaCTzzS4qM61LcpgwOwJmOD2ZGKOux8O8ZfI21aCsR8Ic/pCZmaJRrV
yu6zb1aYAAVrCTU0Jt3JN26HjnrGiSV3SA2lKJXdV+BhFrBtbIyLXDAgtMVJsgg7TRXh
qT8nsx47k9wHTkbrRB2TJP97k340UhLFWf+J3Jy72bdWw+IyAgsiwZQrFk/JZGfGPfAK
YD3Q==
X-Gm-Message-State: AOAM531FBOwMeOtrX+iCd5rwpgKF6C5q97HNt6Ek9yvRxEybx48Y0VuV
o2jgJz0skA9WKaJH2UKqtFn0KqPVo0ATOQ==
X-Google-Smtp-Source: ABdhPJy0jZRfOfYLmVdlVZb2pc9VskwjYRUUvnr9z2IsBBIwDy7YjrOgdO6a17odtX2i/5JfU30r9g==
X-Received: by 2002:a17:90a:e018:: with SMTP id
u24mr4104739pjy.104.1600785127671;
Tue, 22 Sep 2020 07:32:07 -0700 (PDT)
Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])
by smtp.gmail.com with ESMTPSA id l14sm4786037pfc.170.2020.09.22.07.32.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 22 Sep 2020 07:32:06 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Luca Boccassi <bluca@debian.org>, Gaetan Rivet <grive@u256.net>
Date: Tue, 22 Sep 2020 07:31:56 -0700
Message-Id: <20200922143202.8755-3-stephen@networkplumber.org>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200922143202.8755-1-stephen@networkplumber.org>
References: <20200922143202.8755-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH 2/8] eal: replace usage of blacklist/whitelist in
enum
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
This patch renames the enum values in the EAL include files.
As a backward compatible temporary migration tool, define
a replacement mapping for old values.
The old names relating to blacklist and whitelist are replaced
by block list and allow list, but applications may be using the
older compatibility macros. To help with conversion to new names
cause a message when the compatibility names are used.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Luca Boccassi <bluca@debian.org>
Acked-by: Gaetan Rivet <grive@u256.net>
---
lib/librte_eal/common/eal_common_devargs.c | 14 +++++++-------
lib/librte_eal/include/rte_bus.h | 10 ++++++++--
lib/librte_eal/include/rte_dev.h | 10 ++++++++--
lib/librte_eal/include/rte_devargs.h | 10 ++++++++--
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index 2123773ef840..fcf3d9a3ccb2 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -296,7 +296,7 @@ rte_devargs_insert(struct rte_devargs **da)
return 0;
}
-/* store a whitelist parameter for later parsing */
+/* store in allowed list parameter for later parsing */
int
rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
@@ -313,13 +313,13 @@ rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)
goto fail;
devargs->type = devtype;
bus = devargs->bus;
- if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI)
- devargs->policy = RTE_DEV_BLACKLISTED;
+ if (devargs->type == RTE_DEVTYPE_BLOCKED)
+ devargs->policy = RTE_DEV_BLOCKED;
if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
- if (devargs->policy == RTE_DEV_WHITELISTED)
- bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST;
- else if (devargs->policy == RTE_DEV_BLACKLISTED)
- bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST;
+ if (devargs->policy == RTE_DEV_ALLOWED)
+ bus->conf.scan_mode = RTE_BUS_SCAN_ALLOWLIST;
+ else if (devargs->policy == RTE_DEV_BLOCKED)
+ bus->conf.scan_mode = RTE_BUS_SCAN_BLOCKLIST;
}
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h
index d3034d0edf77..80b154fb982c 100644
--- a/lib/librte_eal/include/rte_bus.h
+++ b/lib/librte_eal/include/rte_bus.h
@@ -215,10 +215,16 @@ typedef int (*rte_bus_sigbus_handler_t)(const void *failure_addr);
*/
enum rte_bus_scan_mode {
RTE_BUS_SCAN_UNDEFINED,
- RTE_BUS_SCAN_WHITELIST,
- RTE_BUS_SCAN_BLACKLIST,
+ RTE_BUS_SCAN_ALLOWLIST,
+ RTE_BUS_SCAN_BLOCKLIST,
};
+/* Backwards compatibility will be removed */
+#define RTE_BUS_SCAN_WHITELIST \
+ RTE_DEPRECATED(RTE_BUS_SCAN_WHITELIST) RTE_BUS_SCAN_ALLOWLIST
+#define RTE_BUS_SCAN_BLACKLIST \
+ RTE_DEPRECATED(RTE_BUS_SCAN_BLACKLIST) RTE_BUS_SCAN_BLOCKLIST
+
/**
* A structure used to configure bus operations.
*/
diff --git a/lib/librte_eal/include/rte_dev.h b/lib/librte_eal/include/rte_dev.h
index 81905b3ae35f..02abf92c30a6 100644
--- a/lib/librte_eal/include/rte_dev.h
+++ b/lib/librte_eal/include/rte_dev.h
@@ -52,10 +52,16 @@ typedef void (*rte_dev_event_cb_fn)(const char *device_name,
* Device policies.
*/
enum rte_dev_policy {
- RTE_DEV_WHITELISTED,
- RTE_DEV_BLACKLISTED,
+ RTE_DEV_ALLOWED,
+ RTE_DEV_BLOCKED,
};
+/* Backwards compatiablity will be removed */
+#define RTE_DEV_WHITELISTED \
+ RTE_DEPRECATED(RTE_DEV_WHITELISTED) RTE_DEV_ALLOWED
+#define RTE_DEV_BLACKLISTED \
+ RTE_DEPRECATED(RTE_DEV_BLACKLISTED) RTE_DEV_BLOCKED
+
/**
* A generic memory resource representation.
*/
diff --git a/lib/librte_eal/include/rte_devargs.h b/lib/librte_eal/include/rte_devargs.h
index 898efa0d667b..494e70b584f7 100644
--- a/lib/librte_eal/include/rte_devargs.h
+++ b/lib/librte_eal/include/rte_devargs.h
@@ -29,11 +29,17 @@ extern "C" {
* Type of generic device
*/
enum rte_devtype {
- RTE_DEVTYPE_WHITELISTED_PCI,
- RTE_DEVTYPE_BLACKLISTED_PCI,
+ RTE_DEVTYPE_ALLOWED,
+ RTE_DEVTYPE_BLOCKED,
RTE_DEVTYPE_VIRTUAL,
};
+/* Backwards compatiablity will be removed later */
+#define RTE_DEVTYPE_WHITELISTED_PCI \
+ RTE_DEPRECATED(RTE_DEVTYPE_WHITELISTED_PCI) RTE_DEVTYPE_ALLOWED
+#define RTE_DEVTYPE_BLACKLISTED_PCI \
+ RTE_DEPRECATED(RTE_DEVTYPE_BLACKLISTED_PCI) RTE_DEVTYPE_BLOCKED
+
/**
* Structure that stores a device given by the user with its arguments
*
--
2.27.0