From patchwork Wed Oct 3 19:40:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 45991 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 05BE31B206; Wed, 3 Oct 2018 21:40:52 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id D73051B1F2 for ; Wed, 3 Oct 2018 21:40:50 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 7E85321F21; Wed, 3 Oct 2018 15:40:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 03 Oct 2018 15:40:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=Qe+CQ94f6phz2ARP/L6o4Kg yUeOHfpmC6zWxYuadlA4=; b=oMcw0i3hLhP+hO0dcLtBXgWZUVtnojCs4u52K7p g4qeZl0Pl4+MWyRc9osUAOcXfsXfCSEMX9wE3T5BdsQC9EtTvB6yDJTGIt2BzJft IbO/iQQkiF8KMDEnbTB4xGujg+tZOyS39sP27REW0kRVHLnxK26qtEgJodxpJRX1 eUeI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Qe+CQ94f6phz2ARP/ L6o4KgyUeOHfpmC6zWxYuadlA4=; b=YFHseDiIFIgiaZ/Fr3ezN7b+7tVu5nrjZ yeGzfjcsc/KhmIKWD33OUrZTb4bsiZK+K/a1wYngCPwPVvBjsv8vQGSGN5S4AnJf lotKgSib2ZhpNb9jtL5UFYHIgybQi+ukDFfW/ICbUvMz6NDUh8lNLrIXcTjf+w8d X07DG77S9uKWj8VO8AoYmK1MFjIToT7FfrDDcajSjoHY3a85g6aPSw7/kv6ao5Dg XCyLrhllj31RiQLUehLdJ6XPbveoqER8jnK3pNk7bUMW7lcO3ce/0Q9MdvLNtDL9 00M30VaOvQkWqW5+QWirmnrxNWH1t2gCC8Hg8j9rDaaxiAx9a5aFQ== X-ME-Sender: X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 3E28D102DE; Wed, 3 Oct 2018 15:40:49 -0400 (EDT) From: Thomas Monjalon To: gaetan.rivet@6wind.com Cc: dev@dpdk.org Date: Wed, 3 Oct 2018 21:40:38 +0200 Message-Id: <20181003194039.7202-1-thomas@monjalon.net> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] bus/pci: rename devargs parameter id to addr 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" We could match devices by their PCI id (vendor id, device id, etc). But for now, only matching by PCI address is implemented. The devargs parameter "id" is renamed "addr" to reflect its real meaning. Signed-off-by: Thomas Monjalon Reviewed-by: Andrew Rybchenko --- drivers/bus/pci/pci_params.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 7630d4845..77b722ba9 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -12,12 +12,12 @@ #include "private.h" enum pci_params { - RTE_PCI_PARAMS_ID, + RTE_PCI_PARAMS_ADDR, RTE_PCI_PARAMS_MAX, }; static const char * const pci_params_keys[] = { - [RTE_PCI_PARAMS_ID] = "id", + [RTE_PCI_PARAMS_ADDR] = "addr", [RTE_PCI_PARAMS_MAX] = NULL, }; @@ -47,7 +47,7 @@ pci_dev_match(const struct rte_device *dev, return 0; pdev = RTE_DEV_TO_PCI_CONST(dev); /* if any field does not match. */ - if (rte_kvargs_process(kvlist, "id", + if (rte_kvargs_process(kvlist, pci_params_keys[RTE_PCI_PARAMS_ADDR], &pci_addr_kv_cmp, (void *)(intptr_t)&pdev->addr)) return 1; From patchwork Wed Oct 3 19:40:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 45992 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B120F1B2AE; Wed, 3 Oct 2018 21:40:53 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id DEE7A1B206 for ; Wed, 3 Oct 2018 21:40:50 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8535021F26; Wed, 3 Oct 2018 15:40:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 03 Oct 2018 15:40:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=+n+lSrA2LX J9Qt9FRqUWspO2cpmpo21HIRHss070WdQ=; b=E2/R69QK4GLXAaUOK7W+zEn7ff tWX15AysQNz6yJ10TztB2puw7nBtz0rTGUEV2vjMp+XlDdC3TAfhKxjeR3KTKUto FIjwax8luAusXtDre8tWvEFsxxADOD9b5NQ7IlhF6OtVJIA6uDClA8McMMNsQaFZ A3G4M2wypmT350mHY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=+n+lSrA2LXJ9Qt9FRqUWspO2cpmpo21HIRHss070WdQ=; b=Xjh81gjA JqD1vss7htAIJfdZ4eILW1xgn81Y01P22L5q2eAeeKm837EYO/Ry+P5IWbnopPk5 F7m8shFv3TosKSGJJCcq5DO//+echlYG+wOu07JXvjBqkFrGHSy9cYVXLvLx2RQh CGen0Ud16r1PxSMIKvgYE8Tjr9Vbt/rgKCnwFzD4nUZM3JJKCiu6KuwQ+qz2tb8h Rwq0xjM8FDfejXvMaF1JnIARonClnVqe4LjKmOEJgJQkxibZJ+EcECPEhSS5R7gQ iyNjA/VP86nwWG/CAveeW9X6ce0vaV2aNXk1cIEjIWr904JMOR33RqZlbgeXMY3Y 7JydKsgkm1c/uQ== X-ME-Sender: X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id CA996102E7; Wed, 3 Oct 2018 15:40:49 -0400 (EDT) From: Thomas Monjalon To: gaetan.rivet@6wind.com Cc: dev@dpdk.org Date: Wed, 3 Oct 2018 21:40:39 +0200 Message-Id: <20181003194039.7202-2-thomas@monjalon.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181003194039.7202-1-thomas@monjalon.net> References: <20181003194039.7202-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] devargs: rename enum items with singular form 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 enum names are *_params (plural form). And the items are also using the plural form: *_PARAMS_*. It looks more natural to use the singular form *_PARAM_* for items. Signed-off-by: Thomas Monjalon Reviewed-by: Andrew Rybchenko --- drivers/bus/pci/pci_params.c | 10 +++++----- drivers/bus/vdev/vdev_params.c | 4 ++-- lib/librte_ethdev/rte_class_eth.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 77b722ba9..3192e9c96 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -12,13 +12,13 @@ #include "private.h" enum pci_params { - RTE_PCI_PARAMS_ADDR, - RTE_PCI_PARAMS_MAX, + RTE_PCI_PARAM_ADDR, + RTE_PCI_PARAM_MAX, }; static const char * const pci_params_keys[] = { - [RTE_PCI_PARAMS_ADDR] = "addr", - [RTE_PCI_PARAMS_MAX] = NULL, + [RTE_PCI_PARAM_ADDR] = "addr", + [RTE_PCI_PARAM_MAX] = NULL, }; static int @@ -47,7 +47,7 @@ pci_dev_match(const struct rte_device *dev, return 0; pdev = RTE_DEV_TO_PCI_CONST(dev); /* if any field does not match. */ - if (rte_kvargs_process(kvlist, pci_params_keys[RTE_PCI_PARAMS_ADDR], + if (rte_kvargs_process(kvlist, pci_params_keys[RTE_PCI_PARAM_ADDR], &pci_addr_kv_cmp, (void *)(intptr_t)&pdev->addr)) return 1; diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c index 842a4684e..da270f2ec 100644 --- a/drivers/bus/vdev/vdev_params.c +++ b/drivers/bus/vdev/vdev_params.c @@ -11,11 +11,11 @@ #include "vdev_private.h" enum vdev_params { - RTE_VDEV_PARAMS_MAX, + RTE_VDEV_PARAM_MAX, }; static const char * const vdev_params_keys[] = { - [RTE_VDEV_PARAMS_MAX] = NULL, + [RTE_VDEV_PARAM_MAX] = NULL, }; static int diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c index b6557db97..84b646291 100644 --- a/lib/librte_ethdev/rte_class_eth.c +++ b/lib/librte_ethdev/rte_class_eth.c @@ -15,11 +15,11 @@ #include "ethdev_private.h" enum eth_params { - RTE_ETH_PARAMS_MAX, + RTE_ETH_PARAM_MAX, }; static const char * const eth_params_keys[] = { - [RTE_ETH_PARAMS_MAX] = NULL, + [RTE_ETH_PARAM_MAX] = NULL, }; struct eth_dev_match_arg {