From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com
 [209.85.128.170]) by dpdk.org (Postfix) with ESMTP id 00ED37CC4
 for <dev@dpdk.org>; Fri,  7 Jul 2017 02:05:05 +0200 (CEST)
Received: by mail-wr0-f170.google.com with SMTP id c11so24184970wrc.3
 for <dev@dpdk.org>; Thu, 06 Jul 2017 17:05:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=6wind-com.20150623.gappssmtp.com; s=20150623;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :in-reply-to:references;
 bh=jianhY4tNMW2JGZVN39N7IiwkVpHqT642yHLwYTh+l4=;
 b=BnRU5JSCJCwHCb3Nj0hAlALukPG0CEUdSQw0UOUSszdfpGTHudfUUDRM3do/SGWq8m
 OTJ0Cxrvs4UcxWs7J7iTgFbq+2bPGi8bFKMY0uv5jAO3s6nSsmdOJqZq+tDiKkFlo0d7
 7neWc1AE5KNbXnD3LHQ27Pj3FXwvNx1kHY43FlNQt6Gp2BHN7P/D7WHDtzOBWric9CSk
 Cm3UPexCfh7pcB+iQkdIx1E/h+o1h3oaKfjM5IFErsq84ewgw5zzQ6vSde5/radgeqEm
 Sx7MJnTDo0tgtF7qjNJCSx0JG0hdLvLaukwnTSY4CHpAA6sQmq0biZbw/j1USkcn/ULr
 1V9w==
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:in-reply-to:references;
 bh=jianhY4tNMW2JGZVN39N7IiwkVpHqT642yHLwYTh+l4=;
 b=Z87AzyckgOTRKNh3ndS8Jmc/1Pj62m+0rP7r5IJTMipS7xUlBW4FIArIeo56VbqVgh
 +dawoOISfPN8r27DuWe90Ze3ynYQy7tSWwNB5su2sLesId9WBwDtm0OCg3xt1GcVsYay
 72bgFdqB2kAey2X1z7gTbI3Q3x1t9pc60xfhEkokS7x1p5yWnKn4VO65Z8gGpPTsP9jE
 YHGyzZHrY3aC5lAQYXKrXHf6MV1f5T45OuI7UaGrN3ccQoU3xETbqNGK2QgmHS42vqB8
 bGPNJxeByMGIBOGaVKqayOlzY2Fnf836H+H5P5nHMLSvA6SOYcpppDppNdS7H+oGdSi3
 TH5Q==
X-Gm-Message-State: AIVw113aBcfGnCsWGW5A5JUhmZVcDlb+2lL13/ln6sc3PM1WFZ58BPLS
 hkQnuZ33MzccYfWzUgE=
X-Received: by 10.28.172.4 with SMTP id v4mr272384wme.72.1499385905407;
 Thu, 06 Jul 2017 17:05:05 -0700 (PDT)
Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.
 [62.23.145.78])
 by smtp.gmail.com with ESMTPSA id b197sm1111520wmb.4.2017.07.06.17.05.04
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
 Thu, 06 Jul 2017 17:05:04 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Fri,  7 Jul 2017 02:04:34 +0200
Message-Id: <d31638b4db9105e7f3fa50651e34e12d8eb8d59b.1499384591.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1499384589.git.gaetan.rivet@6wind.com>
References: <cover.1499211959.git.gaetan.rivet@6wind.com>
 <cover.1499384589.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1499384589.git.gaetan.rivet@6wind.com>
References: <cover.1499384589.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v7 17/17] eal: change whitelist / blacklist
	command line doc
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jul 2017 00:05:06 -0000

The use of these commands have evolved.
It is now possible to use whitelist and blacklist on any bus.

Update the source code accordingly.

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 lib/librte_eal/common/eal_common_options.c | 18 +++++++++---------
 lib/librte_eal/common/eal_options.h        |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 075b0ea..245a276 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -86,8 +86,8 @@ eal_long_options[] = {
 	{OPT_NO_HUGE,           0, NULL, OPT_NO_HUGE_NUM          },
 	{OPT_NO_PCI,            0, NULL, OPT_NO_PCI_NUM           },
 	{OPT_NO_SHCONF,         0, NULL, OPT_NO_SHCONF_NUM        },
-	{OPT_PCI_BLACKLIST,     1, NULL, OPT_PCI_BLACKLIST_NUM    },
-	{OPT_PCI_WHITELIST,     1, NULL, OPT_PCI_WHITELIST_NUM    },
+	{OPT_BUS_BLACKLIST,     1, NULL, OPT_BUS_BLACKLIST_NUM    },
+	{OPT_BUS_WHITELIST,     1, NULL, OPT_BUS_WHITELIST_NUM    },
 	{OPT_PROC_TYPE,         1, NULL, OPT_PROC_TYPE_NUM        },
 	{OPT_SOCKET_MEM,        1, NULL, OPT_SOCKET_MEM_NUM       },
 	{OPT_SYSLOG,            1, NULL, OPT_SYSLOG_NUM           },
@@ -1049,14 +1049,14 @@ eal_common_usage(void)
 	       "  -n CHANNELS         Number of memory channels\n"
 	       "  -m MB               Memory to allocate (see also --"OPT_SOCKET_MEM")\n"
 	       "  -r RANKS            Force number of memory ranks (don't detect)\n"
-	       "  -b, --"OPT_PCI_BLACKLIST" Add a PCI device in black list.\n"
-	       "                      Prevent EAL from using this PCI device. The argument\n"
-	       "                      format is <domain:bus:devid.func>.\n"
-	       "  -w, --"OPT_PCI_WHITELIST" Add a PCI device in white list.\n"
-	       "                      Only use the specified PCI devices. The argument format\n"
-	       "                      is <[domain:]bus:devid.func>. This option can be present\n"
+	       "  -b, --"OPT_BUS_BLACKLIST" Black list a device on its bus.\n"
+	       "                      Prevents EAL from using this device. The argument\n"
+	       "                      format depends on the bus.\n"
+	       "  -w, --"OPT_BUS_WHITELIST" White list a device on its bus.\n"
+	       "                      Only use the specified devices. The argument format\n"
+	       "                      depends on the bus. This option can be present\n"
 	       "                      several times (once per device).\n"
-	       "                      [NOTE: PCI whitelist cannot be used with -b option]\n"
+	       "                      [NOTE: whitelist cannot be used with -b option]\n"
 	       "  --"OPT_VDEV"              Add a virtual device.\n"
 	       "                      The argument format is <driver><id>[,key=val,...]\n"
 	       "                      (ex: --vdev=net_pcap0,iface=eth2).\n"
diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h
index a881c62..4c5db07 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -37,10 +37,10 @@ enum {
 	/* long options mapped to a short option */
 #define OPT_HELP              "help"
 	OPT_HELP_NUM            = 'h',
-#define OPT_PCI_BLACKLIST     "pci-blacklist"
-	OPT_PCI_BLACKLIST_NUM   = 'b',
-#define OPT_PCI_WHITELIST     "pci-whitelist"
-	OPT_PCI_WHITELIST_NUM   = 'w',
+#define OPT_BUS_BLACKLIST     "bus-blacklist"
+	OPT_BUS_BLACKLIST_NUM   = 'b',
+#define OPT_BUS_WHITELIST     "bus-whitelist"
+	OPT_BUS_WHITELIST_NUM   = 'w',
 
 	/* first long only option value must be >= 256, so that we won't
 	 * conflict with short options */
-- 
2.1.4