From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by dpdk.org (Postfix) with ESMTP id E9D4F590E for ; Fri, 25 Apr 2014 14:00:07 +0200 (CEST) Received: by mail-wi0-f171.google.com with SMTP id q5so2545382wiv.4 for ; Fri, 25 Apr 2014 05:00:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mUliOEyo8QwjqYFNGkJsWkF+uRuQkxFk7tJWnpNt4KM=; b=M6qPQFRKTJ9ZtZbhZnnZdnp7neqg6t48LBBEtWV0zqgSUpNVCn0quT2EwJ/ltMzWfK ARgjApfZp737Doi4LfcDswwK++YTAKFLmQYiJJBJNu5w0PeHkB5IU92kMO8Ce6T0o09r vC0kHSrxe2b0L99W/UiFYokl9wmU3OMqotjn3TBAPWF7qKInlzKSHCUatB/IO892bNkR zcTevcX0xtFnHeOPkz4Uf6BhO+0mH3p5R1gSKoVdgyBnUdD54OfAd8Wd28tbTV7KnyEn KOfHNPae9lwhcrYcp2oUQeRu21XrqE12/UARFcrvRTLp/sU4GkKdAp/z76xR3QRY9a6W 0rIg== X-Gm-Message-State: ALoCoQkXym2MGlWBUo9bztn7WnQKUGa7vysmLnFSl3GHDEdfVQ6VmOIEED10x5iW8w0bk+/AO+a2 X-Received: by 10.194.109.227 with SMTP id hv3mr6602807wjb.10.1398427210657; Fri, 25 Apr 2014 05:00:10 -0700 (PDT) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id q2sm5487386wix.5.2014.04.25.05.00.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Apr 2014 05:00:10 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Date: Fri, 25 Apr 2014 13:59:39 +0200 Message-Id: <1398427188-14914-2-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398427188-14914-1-git-send-email-olivier.matz@6wind.com> References: <1398427188-14914-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH 01/10] bsd/pci: rename device and driver lists X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 12:00:08 -0000 The bsdapp part was missing in commit 5b1f4a67dd5bcfa8d5139c064ced6e37a9149419. To avoid confusion with virtual devices, rename device_list as pci_device_list and driver_list as pci_driver_list. Signed-off-by: Olivier Matz --- lib/librte_eal/bsdapp/eal/eal_pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 7b04fa6..64bdea0 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -362,13 +362,13 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) } /* device is valid, add in list (sorted) */ - if (TAILQ_EMPTY(&device_list)) { - TAILQ_INSERT_TAIL(&device_list, dev, next); + if (TAILQ_EMPTY(&pci_device_list)) { + TAILQ_INSERT_TAIL(&pci_device_list, dev, next); } else { struct rte_pci_device *dev2 = NULL; - TAILQ_FOREACH(dev2, &device_list, next) { + TAILQ_FOREACH(dev2, &pci_device_list, next) { if (pci_addr_comparison(&dev->addr, &dev2->addr)) continue; else { @@ -376,7 +376,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) return 0; } } - TAILQ_INSERT_TAIL(&device_list, dev, next); + TAILQ_INSERT_TAIL(&pci_device_list, dev, next); } return 0; @@ -503,8 +503,8 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d int rte_eal_pci_init(void) { - TAILQ_INIT(&driver_list); - TAILQ_INIT(&device_list); + TAILQ_INIT(&pci_driver_list); + TAILQ_INIT(&pci_device_list); uio_res_list = RTE_TAILQ_RESERVE_BY_IDX(RTE_TAILQ_PCI, uio_res_list); /* for debug purposes, PCI can be disabled */ -- 1.9.2