@@ -68,6 +68,13 @@ Removed Items
Also, make sure to start the actual text at the margin.
=======================================================
+* eal: Removed the deprecated function ``rte_get_master_lcore()``
+ and the iterarator macro ``RTE_LCORE_FOREACH_SLAVE``.
+
+* eal: The old api arguments that were deprecated for
+ blacklist/whitelist are removed. Users must use the new
+ block/allow list arguments.
+
API Changes
-----------
@@ -65,7 +65,6 @@ eal_short_options[] =
"n:" /* memory channels */
"r:" /* memory ranks */
"v" /* version */
- "w:" /* pci-whitelist (deprecated) */
;
const struct option
@@ -83,7 +82,6 @@ eal_long_options[] = {
{OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM },
{OPT_TRACE_BUF_SIZE, 1, NULL, OPT_TRACE_BUF_SIZE_NUM },
{OPT_TRACE_MODE, 1, NULL, OPT_TRACE_MODE_NUM },
- {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM },
{OPT_MAIN_LCORE, 1, NULL, OPT_MAIN_LCORE_NUM },
{OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM},
{OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -108,10 +106,6 @@ eal_long_options[] = {
{OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },
{OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL, OPT_FORCE_MAX_SIMD_BITWIDTH_NUM},
- /* legacy options that will be removed in future */
- {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },
- {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },
-
{0, 0, NULL, 0 }
};
@@ -1521,10 +1515,6 @@ eal_parse_common_option(int opt, const char *optarg,
static int a_used;
switch (opt) {
- case OPT_PCI_BLACKLIST_NUM:
- fprintf(stderr,
- "Option --pci-blacklist is deprecated, use -b, --block instead\n");
- /* fallthrough */
case 'b':
if (a_used)
goto ba_conflict;
@@ -1533,10 +1523,6 @@ eal_parse_common_option(int opt, const char *optarg,
b_used = 1;
break;
- case 'w':
- fprintf(stderr,
- "Option -w, --pci-whitelist is deprecated, use -a, --allow option instead\n");
- /* fallthrough */
case 'a':
if (b_used)
goto ba_conflict;
@@ -1698,11 +1684,6 @@ eal_parse_common_option(int opt, const char *optarg,
conf->process_type = eal_parse_proc_type(optarg);
break;
- case OPT_MASTER_LCORE_NUM:
- fprintf(stderr,
- "Option --" OPT_MASTER_LCORE
- " is deprecated use " OPT_MAIN_LCORE "\n");
- /* fallthrough */
case OPT_MAIN_LCORE_NUM:
if (eal_parse_main_lcore(optarg) < 0) {
RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -18,10 +18,6 @@ enum {
#define OPT_DEV_BLOCK "block"
OPT_DEV_BLOCK_NUM = 'b',
- /* legacy option that will be removed in future */
-#define OPT_PCI_WHITELIST "pci-whitelist"
- OPT_PCI_WHITELIST_NUM = 'w',
-
/* first long only option value must be >= 256, so that we won't
* conflict with short options */
OPT_LONG_MIN_NUM = 256,
@@ -49,8 +45,6 @@ enum {
OPT_TRACE_MODE_NUM,
#define OPT_MAIN_LCORE "main-lcore"
OPT_MAIN_LCORE_NUM,
-#define OPT_MASTER_LCORE "master-lcore"
- OPT_MASTER_LCORE_NUM,
#define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
OPT_MBUF_POOL_OPS_NAME_NUM,
#define OPT_PROC_TYPE "proc-type"
@@ -94,10 +88,6 @@ enum {
#define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth"
OPT_FORCE_MAX_SIMD_BITWIDTH_NUM,
- /* legacy option that will be removed in future */
-#define OPT_PCI_BLACKLIST "pci-blacklist"
- OPT_PCI_BLACKLIST_NUM,
-
OPT_LONG_MAX_NUM
};
@@ -219,12 +219,6 @@ enum rte_bus_scan_mode {
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.
*/
@@ -56,12 +56,6 @@ enum rte_dev_policy {
RTE_DEV_BLOCKED,
};
-/* Backwards compatibility 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.
*/
@@ -58,12 +58,6 @@ enum rte_devtype {
RTE_DEVTYPE_VIRTUAL,
};
-/* Backwards compatibility 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
*
@@ -73,10 +73,6 @@ enum rte_rmt_call_main_t {
CALL_MAIN, /**< lcore handler executed by main core. */
};
-/* These legacy definitions will be removed in future release */
-#define SKIP_MASTER RTE_DEPRECATED(SKIP_MASTER) SKIP_MAIN
-#define CALL_MASTER RTE_DEPRECATED(CALL_MASTER) CALL_MAIN
-
/**
* Launch a function on all lcores.
*
@@ -86,18 +86,6 @@ rte_lcore_id(void)
*/
unsigned int rte_get_main_lcore(void);
-/**
- * Deprecated function the id of the main lcore
- *
- * @return
- * the id of the main lcore
- */
-__rte_deprecated
-static inline unsigned int rte_get_master_lcore(void)
-{
- return rte_get_main_lcore();
-}
-
/**
* Return the number of execution units (lcores) on the system.
*
@@ -246,9 +234,6 @@ unsigned int rte_get_next_lcore(unsigned int i, int skip_main, int wrap);
i < RTE_MAX_LCORE; \
i = rte_get_next_lcore(i, 1, 0))
-#define RTE_LCORE_FOREACH_SLAVE(l) \
- RTE_DEPRECATED(RTE_LCORE_FOREACH_SLAVE) RTE_LCORE_FOREACH_WORKER(l)
-
/**
* Callback prototype for initializing lcores.
*