From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by dpdk.org (Postfix) with ESMTP id 73C63804B for ; Tue, 9 Dec 2014 04:43:56 +0100 (CET) Received: by mail-pd0-f171.google.com with SMTP id y13so6432295pdi.16 for ; Mon, 08 Dec 2014 19:43:55 -0800 (PST) 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=GJxQo3BTaU9vbB4KVsqsjQ9tObcQGix1GOOCsAiUS5Y=; b=mmTfc+Cz5fl+g/QirlnvhD08iLvGsnrpbhKc3EfYhXX5QKqEH5WqzdU+hPzk7NPcK7 oJ4k6wB1Fjmlm2wDnYo0YdS+lfj8imbvCGzpw2NPu5Y6xibS+untOd3ln4e1hbsU9IxO e111p0VKJt2XVBETTvK9Tsjo7eHMTGH5s1olo9nTWF3CdzoQ8+kJfRmZ17kQL+h53DRw +0/CCQ/IdB4LUP5YITv9hDYxiZJwdFFJdaT0s6btPjwOlN4v6bvlJcw7oIzkT0yjv/j4 vdTVHvI8XtMHcSJrf9j0ChzdSE56eQfHHfhlmV2zeg1z9uyt4n/ka5vNEkb6l4adHDah Vukg== X-Gm-Message-State: ALoCoQnnZqPRCzK5CEnLcXmqFvNQe3RirU1UBxiKb+bT49zHYCymwjVHLNF93Y9Yw00TXHLS9vhZ X-Received: by 10.70.133.72 with SMTP id pa8mr26307885pdb.59.1418096635837; Mon, 08 Dec 2014 19:43:55 -0800 (PST) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id xx2sm2185pab.17.2014.12.08.19.43.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Dec 2014 19:43:55 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 9 Dec 2014 12:42:41 +0900 Message-Id: <1418096571-27531-19-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> References: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, menrigh@brocade.com, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [PATCH v2 18/28] eal/pci: Prevent double registrations for pci_device_list 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: Tue, 09 Dec 2014 03:43:57 -0000 The patch fixes pci_scan_one() not to register same pci devices twice. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/linuxapp/eal/eal_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index fe212d1..355c858 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -306,14 +306,17 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, } else { struct rte_pci_device *dev2 = NULL; + int ret; TAILQ_FOREACH(dev2, &pci_device_list, next) { - if (eal_compare_pci_addr(&dev->addr, &dev2->addr) != 0) + ret = eal_compare_pci_addr(&dev->addr, &dev2->addr); + if (ret > 0) continue; - else { + else if (ret < 0) { TAILQ_INSERT_BEFORE(dev2, dev, next); return 0; - } + } else /* already registered */ + return 0; } TAILQ_INSERT_TAIL(&pci_device_list, dev, next); } -- 1.9.1