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 509D5A0527;
Mon, 9 Nov 2020 17:06:24 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 1A6735F18;
Mon, 9 Nov 2020 17:06:23 +0100 (CET)
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by dpdk.org (Postfix) with ESMTP id 1B9DF5AB8
for <dev@dpdk.org>; Mon, 9 Nov 2020 17:06:20 +0100 (CET)
IronPort-SDR: PIHmyfNrYXoOw2KON2JxeENoHJ8pRQBy9UBWU556Lo/sPJr0e8DrmJSR4ysGuhCZblCZbEpQZt
AWpgeQgUh3LQ==
X-IronPort-AV: E=McAfee;i="6000,8403,9800"; a="156832257"
X-IronPort-AV: E=Sophos;i="5.77,463,1596524400"; d="scan'208";a="156832257"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
09 Nov 2020 08:05:59 -0800
IronPort-SDR: PLcC/s3NQfjCtfizxU0l+93M+xbUnl4wbmTaGR6sWTSFzr/QJV7BPgn01ZhSqhBjgIabIZZHHq
dT3JZTWUfBJQ==
X-IronPort-AV: E=Sophos;i="5.77,463,1596524400"; d="scan'208";a="540905281"
Received: from bricha3-mobl.ger.corp.intel.com ([10.214.194.11])
by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA;
09 Nov 2020 08:05:53 -0800
Date: Mon, 9 Nov 2020 16:05:48 +0000
From: Bruce Richardson <bruce.richardson@intel.com>
To: David Marchand <david.marchand@redhat.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Thomas Monjalon <thomas@monjalon.net>, dev <dev@dpdk.org>,
Luca Boccassi <bluca@debian.org>, Gaetan Rivet <grive@u256.net>
Message-ID: <20201109160548.GJ831@bricha3-MOBL.ger.corp.intel.com>
References: <20200922143202.8755-1-stephen@networkplumber.org>
<20201105223602.5965-1-stephen@networkplumber.org>
<20201105223602.5965-2-stephen@networkplumber.org>
<20201109134931.GG831@bricha3-MOBL.ger.corp.intel.com>
<20201109075440.44130509@hermes.local>
<CAJFAV8zKLwphemj+faU8vXNezAirP1wx=u3ebPBub9WKDk5WjA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAJFAV8zKLwphemj+faU8vXNezAirP1wx=u3ebPBub9WKDk5WjA@mail.gmail.com>
Subject: Re: [dpdk-dev] [PATCH v9 1/6] 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>
On Mon, Nov 09, 2020 at 05:03:06PM +0100, David Marchand wrote:
> On Mon, Nov 9, 2020 at 4:55 PM Stephen Hemminger
> <stephen@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