From patchwork Thu Nov 27 17:14:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Sankar X-Patchwork-Id: 1673 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 095422E81; Thu, 27 Nov 2014 18:15:58 +0100 (CET) Received: from bgl-iport-2.cisco.com (bgl-iport-2.cisco.com [72.163.197.26]) by dpdk.org (Postfix) with ESMTP id E6B7E2A9 for ; Thu, 27 Nov 2014 18:15:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2531; q=dns/txt; s=iport; t=1417108557; x=1418318157; h=from:to:cc:subject:date:message-id; bh=BoNdUZ85OBtJtRU1OdkC9wag26M2B8xxoovk3qHuF9g=; b=g/TumhT+7f+XjCSo8HQNjO7lCmoR2fFNukJwLbV4xIWiJdPGpt/PoGLk GTmb8cTBaWWquLTDvjaNiPoGf4XNPUolOsr9Q8R3uax0PlKbY8H5cd2AZ K754eXCANNh3tXCrRLDz3gFkMVcTFlR/Zsq+N9A3cuA/epxmjfmO5H+Y8 U=; X-IronPort-AV: E=Sophos;i="5.07,470,1413244800"; d="scan'208";a="47894802" Received: from vla196-nat.cisco.com (HELO bgl-core-2.cisco.com) ([72.163.197.24]) by bgl-iport-2.cisco.com with ESMTP; 27 Nov 2014 17:15:55 +0000 Received: from localhost ([10.106.186.168]) (authenticated bits=0) by bgl-core-2.cisco.com (8.14.5/8.14.5) with ESMTP id sARHFoPZ007605 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 27 Nov 2014 17:15:54 GMT From: Sujith Sankar To: dev@dpdk.org Date: Thu, 27 Nov 2014 22:44:40 +0530 Message-Id: <1417108480-28341-1-git-send-email-ssujith@cisco.com> X-Mailer: git-send-email 1.9.1 X-Authenticated-User: ssujith@cisco.com Subject: [dpdk-dev] [PATCH] enicpmd: compilation error during inclusion of vfio.h 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Inclusion of vfio.h was giving compilation errors if kernel version is less than 3.6.0 and if RTE_EAL_VFIO was on in config. Replaced inclusion of vfio.h with eal_vfio.h and replaced RTE_EAL_VFIO with VFIO_PRESENT in enicpmd code. Signed-off-by: Sujith Sankar Reported-by: Pawel Wodkowski --- lib/librte_pmd_enic/Makefile | 1 + lib/librte_pmd_enic/enic_main.c | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/librte_pmd_enic/Makefile b/lib/librte_pmd_enic/Makefile index d4c2f66..befc552 100644 --- a/lib/librte_pmd_enic/Makefile +++ b/lib/librte_pmd_enic/Makefile @@ -39,6 +39,7 @@ LIB = librte_pmd_enic.a CFLAGS += -I$(RTE_SDK)/lib/librte_hash/ -I$(RTE_SDK)/lib/librte_pmd_enic/vnic/ CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_enic/ +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal/ CFLAGS += -O3 -Wno-deprecated VPATH += $(RTE_SDK)/lib/librte_pmd_enic/src diff --git a/lib/librte_pmd_enic/enic_main.c b/lib/librte_pmd_enic/enic_main.c index 4b857bb..f6f00d3 100644 --- a/lib/librte_pmd_enic/enic_main.c +++ b/lib/librte_pmd_enic/enic_main.c @@ -39,9 +39,6 @@ #include #include #include -#ifdef RTE_EAL_VFIO -#include -#endif #include #include @@ -631,7 +628,7 @@ int enic_enable(struct enic *enic) vnic_dev_enable_wait(enic->vdev); -#ifndef RTE_EAL_VFIO +#ifndef VFIO_PRESENT /* Register and enable error interrupt */ rte_intr_callback_register(&(enic->pdev->intr_handle), enic_intr_handler, (void *)enic->rte_dev); @@ -995,7 +992,7 @@ int enic_setup_finish(struct enic *enic) return 0; } -#ifdef RTE_EAL_VFIO +#ifdef VFIO_PRESENT static void enic_eventfd_init(struct enic *enic) { enic->eventfd = enic->pdev->intr_handle.fd; @@ -1033,7 +1030,7 @@ int enic_get_link_status(struct enic *enic) } -#ifdef RTE_EAL_VFIO +#ifdef VFIO_PRESENT static int enic_create_err_intr_thread(struct enic *enic) { pthread_attr_t intr_attr; @@ -1111,7 +1108,7 @@ static void enic_dev_deinit(struct enic *enic) if (eth_dev->data->mac_addrs) rte_free(eth_dev->data->mac_addrs); -#ifdef RTE_EAL_VFIO +#ifdef VFIO_PRESENT enic_clear_intr_mode(enic); #endif } @@ -1167,7 +1164,7 @@ static int enic_dev_init(struct enic *enic) */ enic_get_res_counts(enic); -#ifdef RTE_EAL_VFIO +#ifdef VFIO_PRESENT /* Set interrupt mode based on resource counts and system * capabilities */