From patchwork Wed Jun 7 23:57:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 25163 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 473537D36; Thu, 8 Jun 2017 01:58:16 +0200 (CEST) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id B3B717CD6 for ; Thu, 8 Jun 2017 01:57:41 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id d73so20758984wma.0 for ; Wed, 07 Jun 2017 16:57:41 -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=JnPfBxdaCjhDpkHCzwBRavZfgGC/jtnjHRTEey4TFAA=; b=bY9jMin2tHeT95+lmIAnmHmJ5Dg1e8jR8ZMgNflJ1Cu6wSDUdocexEFoeYE7KkSOKV jkRKhzxtsG9e/feRuocpQcDgFPqgLZxgnd7/6lTVanH9sMFMt7C/XtcM6A2qNeLZE+vq 7o3UEcesJ/pYnVN3HglaG73xgsdwyST8STb0gx16uROSU2TUVcA3iaQ0exstt6LSEnzP FNR6yPnHrEIyk2hfcLvrHsmB1kqoo4rKct8tzwHnIo3IBHvVajqlY/AZ3W34yXJDWQ2R 11A/YhpnpXa4MdGGteMXQYzlT1xBj2sO/14ZrcSNmkaFuvpm/g3vH8JbAWu9MEwyAr6d i6RA== 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=JnPfBxdaCjhDpkHCzwBRavZfgGC/jtnjHRTEey4TFAA=; b=B3rECjQb9vVm68wTWb5EUR2bBxqWyP3AY15jfs39HI9vBicBZYmkhm9hfTUrw6xLtq NbPJM6jdTChIWK/N/lr8y4RS9ZFNy87sQ7khijY5SI9XTZWhtUlUDyk1Ka4quBz1t2ru tSCAHzuAoNZpp3PfZ7Z9ZWAfHWFQtX0q9oy40EIH9mHwu5GROykSLUy/WMw7cLQgB2/K wtfbx7DG8lIB/V3cPMkP2mslr8tdia99QECm+fAtxkdFq/IErcLaJbBSBZAQnJv8r+wA ERnJIAn5x83++M6ugl7HELtKAyRayrOuswVfFnjYT8sP2E4r0igJ7WzKa0IQmEMfC0Jh /hYg== X-Gm-Message-State: AODbwcCfU4bvIeEdk041G9D1/zVOj8p1REicX9vF6mcI8yj8Nhg6OlPI JWPUB2Ap8A5ZAUjIN1Q= X-Received: by 10.28.52.139 with SMTP id b133mr1403813wma.119.1496879861195; Wed, 07 Jun 2017 16:57:41 -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 185sm22397056wmp.1.2017.06.07.16.57.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 16:57:40 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 8 Jun 2017 01:57:05 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 19/19] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 .\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 [,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 */