On Mon, Nov 09, 2020 at 05:03:06PM +0100, David Marchand wrote:
> On Mon, Nov 9, 2020 at 4:55 PM Stephen Hemminger
> <step...@networkplumber.org> wrote:
> > > This patch causes build failures which persist until patch 3, because of
> > > these deprecations. I think you need to define the backward-compatibility
> > > macros here, but only mark them deprecated at the end of the set.
> > >
> > > /Bruce
> >
> > Is building without warnings in every step that important?
> > The previous patch series for master/slave had the same effect
>
> Thomas fixed it while applying.
> https://patchwork.dpdk.org/cover/80987/#122107
>
>
In this case I believe the below needs to be applied to patch 1, and then
the inverse of it set as patch 4 to mark the compatibility macros as
deprecated.
/Bruce
diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h
index 80b154fb9..db90422ab 100644
--- a/lib/librte_eal/include/rte_bus.h
+++ b/lib/librte_eal/include/rte_bus.h
@@ -221,9 +221,9 @@ enum rte_bus_scan_mode {
/* Backwards compatibility will be removed */
#define RTE_BUS_SCAN_WHITELIST \
- RTE_DEPRECATED(RTE_BUS_SCAN_WHITELIST) RTE_BUS_SCAN_ALLOWLIST
+ RTE_BUS_SCAN_ALLOWLIST
#define RTE_BUS_SCAN_BLACKLIST \
- RTE_DEPRECATED(RTE_BUS_SCAN_BLACKLIST) RTE_BUS_SCAN_BLOCKLIST
+ 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 6dd72c11a..6cc56a769 100644
--- a/lib/librte_eal/include/rte_dev.h
+++ b/lib/librte_eal/include/rte_dev.h
@@ -58,9 +58,9 @@ enum rte_dev_policy {
/* Backwards compatibility will be removed */
#define RTE_DEV_WHITELISTED \
- RTE_DEPRECATED(RTE_DEV_WHITELISTED) RTE_DEV_ALLOWED
+ RTE_DEV_ALLOWED
#define RTE_DEV_BLACKLISTED \
- RTE_DEPRECATED(RTE_DEV_BLACKLISTED) RTE_DEV_BLOCKED
+ 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 296f19324..8fed046e9 100644
--- a/lib/librte_eal/include/rte_devargs.h
+++ b/lib/librte_eal/include/rte_devargs.h
@@ -36,9 +36,9 @@ enum rte_devtype {
/* Backwards compatibility will be removed later */
#define RTE_DEVTYPE_WHITELISTED_PCI \
- RTE_DEPRECATED(RTE_DEVTYPE_WHITELISTED_PCI) RTE_DEVTYPE_ALLOWED
+ RTE_DEVTYPE_ALLOWED
#define RTE_DEVTYPE_BLACKLISTED_PCI \
- RTE_DEPRECATED(RTE_DEVTYPE_BLACKLISTED_PCI) RTE_DEVTYPE_BLOCKED
+ RTE_DEVTYPE_BLOCKED
/**
* Structure that stores a device given by the user with its arguments
