From patchwork Thu Oct 12 10:45:47 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: 30245 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 5500B1B2BB; Thu, 12 Oct 2017 12:46:47 +0200 (CEST) Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by dpdk.org (Postfix) with ESMTP id 488D11B25D for ; Thu, 12 Oct 2017 12:46:28 +0200 (CEST) Received: by mail-wm0-f45.google.com with SMTP id u138so11956675wmu.5 for ; Thu, 12 Oct 2017 03:46:28 -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=qj9ZKS/GZlUtNHsoP0nk37Lg8/SVgZKG3vYmGTN6rlE=; b=p0WvVA8GpXV706uNbaOYLPvrS/oNz6/L9e1KLENCFXSjcn8VTier8EF9UlW2wGGP1S hYC6ExZraA1mPt6EPhGBhG8hCl8rVRx+VsD/0M0bIVzbf32oJRCM7gGZhML11mDDFj1H Pp8GpIvRIxvhFSlnkCnck+O6O/3tsqefb2tRYm6R2ORn+4rxbvEIM9zMdhBccfD3OH/U 2NALr/GXGkXRk7W0AsSVqIEqtgi4psUPlfAOP2mgicKLEdK8kgAGWYn/XBfWnkQNq+Yw n6+M6sYdoWTooSLXwRn/5gidY5n8bFBbbrwzkqcQldEhe7X/iBcG1PhW7DuIxs1twaT2 f+ZA== 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=qj9ZKS/GZlUtNHsoP0nk37Lg8/SVgZKG3vYmGTN6rlE=; b=UBUn2gGIefBqLu7qVtO22dm7m6+CkMu0DNTB1ZkUBJDwiX4vptAlN7nNmMvic4VAW8 W6HlmPj8gMAUskT+AxIiY50JNzRXhMw2JML2OXmermHeYFkBTGrU7ZWy7ofUfAcaGbIn kJi89oOup98zEuqgJ0n7IrYyhxo+VNAo4CDh+qYklxPspJ7RkixgmteGVUMao2Wq21fk fklHkBB2E0vBY+hu6R6SjPBumXZHvKFvKtVNxsMaLhAS2aqL5D0IC33tMqqfSYaoMYeV psDfLZbUoAXO2uCFiUhE6kasYTJKVrs7+BehCB3MUbEP1gtIJYra9y/tLIf0zWd7EwlA S1QA== X-Gm-Message-State: AMCzsaXeuNyBe/smfMGFajRfz+FpzQjlBTKaJM7PPB/Mb/v2fcQcZeuw txsR/ONl30TRgVrgHbGo8Lp5jSfU X-Google-Smtp-Source: AOwi7QCl0GYG2u4YMfXQSsW6yireJ5au4wUo4wX9Xs6fYF+x+FqTuQpjN7CpapOTpiD9kvNZlt05tw== X-Received: by 10.223.165.65 with SMTP id j1mr1901578wrb.206.1507805187602; Thu, 12 Oct 2017 03:46:27 -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 z192sm16481146wmz.28.2017.10.12.03.46.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 03:46:26 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 12 Oct 2017 12:45:47 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v5 20/20] bus: rename scan policy as probe policy 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" This bus configuration item is misnamed, as it actually refers to the probing process. Signed-off-by: Gaetan Rivet --- drivers/bus/pci/pci_common.c | 2 +- lib/librte_eal/common/eal_common_devargs.c | 6 +++--- lib/librte_eal/common/include/rte_bus.h | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index d7a1c05..cc23a39 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -373,7 +373,7 @@ rte_pci_probe(void) int probe_all = 0; int ret = 0; - if (rte_pci_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST) + if (rte_pci_bus.bus.conf.probe_mode != RTE_BUS_PROBE_WHITELIST) probe_all = 1; FOREACH_DEVICE_ON_PCIBUS(dev) { diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 6ac88d6..f5ef913 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -170,11 +170,11 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) bus = devargs->bus; if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) devargs->policy = RTE_DEV_BLACKLISTED; - if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) { + if (bus->conf.probe_mode == RTE_BUS_PROBE_UNDEFINED) { if (devargs->policy == RTE_DEV_WHITELISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST; + bus->conf.probe_mode = RTE_BUS_PROBE_WHITELIST; else if (devargs->policy == RTE_DEV_BLACKLISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST; + bus->conf.probe_mode = RTE_BUS_PROBE_BLACKLIST; } TAILQ_INSERT_TAIL(&devargs_list, devargs, next); return 0; diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index 6fb0834..331d954 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -168,19 +168,19 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev); typedef int (*rte_bus_parse_t)(const char *name, void *addr); /** - * Bus scan policies + * Bus probe policies */ -enum rte_bus_scan_mode { - RTE_BUS_SCAN_UNDEFINED, - RTE_BUS_SCAN_WHITELIST, - RTE_BUS_SCAN_BLACKLIST, +enum rte_bus_probe_mode { + RTE_BUS_PROBE_UNDEFINED, + RTE_BUS_PROBE_WHITELIST, + RTE_BUS_PROBE_BLACKLIST, }; /** * A structure used to configure bus operations. */ struct rte_bus_conf { - enum rte_bus_scan_mode scan_mode; /**< Scan policy. */ + enum rte_bus_probe_mode probe_mode; /**< Probe policy. */ };