New API for these were added in 20.11 and the old API was retained
but marked deprecated. Since 21.11 is the next LTS, it is time
to remove the deprecated ones.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: David Marchand <david.marchand@redhat.com>
Also, make sure to start the actual text at the margin.
=======================================================
Also, make sure to start the actual text at the margin.
=======================================================
+* eal: Removed the deprecated function ``rte_get_master_lcore()``
+ and the iterator 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.
+
"n:" /* memory channels */
"r:" /* memory ranks */
"v" /* version */
"n:" /* memory channels */
"r:" /* memory ranks */
"v" /* version */
- "w:" /* pci-whitelist (deprecated) */
{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_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 },
{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 },
{OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },
{OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL, OPT_FORCE_MAX_SIMD_BITWIDTH_NUM},
{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 },
-
static int a_used;
switch (opt) {
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;
case 'b':
if (a_used)
goto ba_conflict;
- 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;
case 'a':
if (b_used)
goto ba_conflict;
conf->process_type = eal_parse_proc_type(optarg);
break;
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 --"
case OPT_MAIN_LCORE_NUM:
if (eal_parse_main_lcore(optarg) < 0) {
RTE_LOG(ERR, EAL, "invalid parameter for --"
#define OPT_DEV_BLOCK "block"
OPT_DEV_BLOCK_NUM = 'b',
#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,
/* first long only option value must be >= 256, so that we won't
* conflict with short options */
OPT_LONG_MIN_NUM = 256,
OPT_TRACE_MODE_NUM,
#define OPT_MAIN_LCORE "main-lcore"
OPT_MAIN_LCORE_NUM,
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"
#define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
OPT_MBUF_POOL_OPS_NAME_NUM,
#define OPT_PROC_TYPE "proc-type"
#define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth"
OPT_FORCE_MAX_SIMD_BITWIDTH_NUM,
#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,
-
RTE_BUS_SCAN_BLOCKLIST,
};
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.
*/
/**
* A structure used to configure bus operations.
*/
-/* 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.
*/
/**
* A generic memory resource representation.
*/
-/* 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
*
/**
* Structure that stores a device given by the user with its arguments
*
CALL_MAIN, /**< lcore handler executed by main core. */
};
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.
*
/**
* Launch a function on all lcores.
*
*/
unsigned int rte_get_main_lcore(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.
*
/**
* Return the number of execution units (lcores) on the system.
*
i < RTE_MAX_LCORE; \
i = rte_get_next_lcore(i, 1, 0))
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.
*
/**
* Callback prototype for initializing lcores.
*