From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com
[209.85.220.41]) by dpdk.org (Postfix) with ESMTP id A23045A6D
for <dev@dpdk.org>; Fri, 10 Jul 2015 01:26:20 +0200 (CEST)
Received: by pabvl15 with SMTP id vl15so157614685pab.1
for <dev@dpdk.org>; Thu, 09 Jul 2015 16:26:20 -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=0RCSR0bnYzIt4TE7BEhOHwijcbajPOmw9JVjAnnA/cc=;
b=PeBVM152AiaB9/hL8qZCb+mCgUlaVCDPQLf5/ca4I8nKQ+zBy32TMguN/isGCC2GpQ
2wT9Q1xsJ4XBsbKGy3R7TRRm+TKiivr9kuoznUmMowhzizaFIbH66/RhiuMZ8ewzV9Ye
z+54hSOmnnINQzcCIrNHPFRDQUFDn3LT+hMGwGYYMixtllQsziOHfDSMKq47XSPoM1tb
AXaosx6gJA4oAHJEmXTClX6uSjkAyq4JicXy0ktFG6lYbRo5sbYMOWfoRS7pvULhx7QO
8m1oscU5XMvFVkg9D/hHX8BzbbqhFlTfeTgJ6klfXXcqd98YQtrznv04NYf9cdD5l6fG
xP2g==
X-Gm-Message-State: ALoCoQmmcK3FwVtj0NOwn3fkH1F/qzb5j/6FOC5bbkHjEAxhKwXNGdG8PTIZkwyrvYxiSZNR5h9k
X-Received: by 10.66.145.33 with SMTP id sr1mr35397177pab.41.1436484380013;
Thu, 09 Jul 2015 16:26:20 -0700 (PDT)
Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net.
[50.53.82.155])
by smtp.gmail.com with ESMTPSA id ky17sm583659pab.31.2015.07.09.16.26.19
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Thu, 09 Jul 2015 16:26:19 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Date: Thu, 9 Jul 2015 16:26:27 -0700
Message-Id: <1436484387-29273-3-git-send-email-stephen@networkplumber.org>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1436484387-29273-1-git-send-email-stephen@networkplumber.org>
References: <1436484387-29273-1-git-send-email-stephen@networkplumber.org>
Cc: Stephen Hemminger <shemming@brocade.com>
Subject: [dpdk-dev] [PATCH v2 2/2] vfio: don't build unnecessary files
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jul 2015 23:26:21 -0000
From: Stephen Hemminger <shemming@brocade.com>
If VFIO is configured, it is better to just not build the source
files (rather than generating empty object files).
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/librte_eal/linuxapp/eal/Makefile | 4 ++--
lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 3 ---
lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c | 3 ---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index 42a16fe..bc513c0 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -64,8 +64,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_thread.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_log.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci_uio.c
-SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci_vfio.c
-SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci_vfio_mp_sync.c
+SRCS-$(CONFIG_RTE_EAL_VFIO) += eal_pci_vfio.c
+SRCS-$(CONFIG_RTE_EAL_VFIO) += eal_pci_vfio_mp_sync.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_debug.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_lcore.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_timer.c
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
index 426953a..9ba4b10 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
@@ -59,8 +59,6 @@
* This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y".
*/
-#ifdef VFIO_PRESENT
-
#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
#define PAGE_MASK (~(PAGE_SIZE - 1))
@@ -909,4 +907,3 @@ pci_vfio_is_enabled(void)
{
return vfio_cfg.vfio_enabled;
}
-#endif
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
index fec7080..657fc2c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
@@ -62,8 +62,6 @@
* This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y".
*/
-#ifdef VFIO_PRESENT
-
#define SOCKET_PATH_FMT "%s/.%s_mp_socket"
#define CMSGLEN (CMSG_LEN(sizeof(int)))
#define FD_TO_CMSGHDR(fd, chdr) \
@@ -391,4 +389,3 @@ pci_vfio_mp_sync_setup(void)
return 0;
}
-#endif
--
2.1.4