From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alln-iport-3.cisco.com (alln-iport-3.cisco.com [173.37.142.90]) by dpdk.org (Postfix) with ESMTP id 472072A9 for ; Thu, 27 Nov 2014 18:22:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2859; q=dns/txt; s=iport; t=1417108953; x=1418318553; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=69Q16eKGdJoqYkiXy+yQaQpclDg1+H2Qk/XefdiKc7w=; b=iBRa5cZvaplddxuXesXFka5MEBEPV2DUIXfi/BQ3Z5JN14JcICy8ErXY GVjYO/R7o8M2FreRFHPD4nJbX5E2yUhVn2m/H8AuSm0k1zvm3J3tfa0hI XzFSt66OVHkYTOixsTZpgkqIA19TlrAQCHjsoaZOnBqBAoOXshqnTx7Z5 g=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgcFAJpcd1StJV2Y/2dsb2JhbABbgwaBLc4OAoEKFgEBAQEBfYQDAQEEJxNPAgEINhAyJQIEE4hA0jwBAQEBAQEEAQEBAQEBHJEChE0FkmWMHJccg3xvgUiBAgEBAQ X-IronPort-AV: E=Sophos;i="5.07,470,1413244800"; d="scan'208";a="100699541" Received: from rcdn-core-1.cisco.com ([173.37.93.152]) by alln-iport-3.cisco.com with ESMTP; 27 Nov 2014 17:22:31 +0000 Received: from xhc-aln-x09.cisco.com (xhc-aln-x09.cisco.com [173.36.12.83]) by rcdn-core-1.cisco.com (8.14.5/8.14.5) with ESMTP id sARHMVZT024783 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Thu, 27 Nov 2014 17:22:31 GMT Received: from xmb-aln-x07.cisco.com ([169.254.2.173]) by xhc-aln-x09.cisco.com ([173.36.12.83]) with mapi id 14.03.0195.001; Thu, 27 Nov 2014 11:22:31 -0600 From: "Sujith Sankar (ssujith)" To: "dev@dpdk.org" Thread-Topic: [PATCH] enicpmd: compilation error during inclusion of vfio.h Thread-Index: AQHQCmXPoRwfNA9xBE+MVOoZyzXf/px1eXMA Date: Thu, 27 Nov 2014 17:22:31 +0000 Message-ID: References: <1417108480-28341-1-git-send-email-ssujith@cisco.com> In-Reply-To: <1417108480-28341-1-git-send-email-ssujith@cisco.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.3.9.131030 x-originating-ip: [10.65.44.66] Content-Type: text/plain; charset="us-ascii" Content-ID: <1F93DD0C5FBB8646A266744B7E3C9E4D@emea.cisco.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [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: , X-List-Received-Date: Thu, 27 Nov 2014 17:22:33 -0000 On 27/11/14 10:44 pm, "Sujith Sankar (ssujith)" wrote: >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. eal_vfio.h is not included. The inclusion of vfio.h is removed. Sorry for the error in the description. > >Signed-off-by: Sujith Sankar >--- > 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 =3D librte_pmd_enic.a >=20 > CFLAGS +=3D -I$(RTE_SDK)/lib/librte_hash/ >-I$(RTE_SDK)/lib/librte_pmd_enic/vnic/ > CFLAGS +=3D -I$(RTE_SDK)/lib/librte_pmd_enic/ >+CFLAGS +=3D -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal/ > CFLAGS +=3D -O3 -Wno-deprecated >=20 > VPATH +=3D $(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 >=20 > #include > #include >@@ -631,7 +628,7 @@ int enic_enable(struct enic *enic) >=20 > vnic_dev_enable_wait(enic->vdev); >=20 >-#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; > } >=20 >-#ifdef RTE_EAL_VFIO >+#ifdef VFIO_PRESENT > static void enic_eventfd_init(struct enic *enic) > { > enic->eventfd =3D enic->pdev->intr_handle.fd; >@@ -1033,7 +1030,7 @@ int enic_get_link_status(struct enic *enic) > } >=20 >=20 >-#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); >=20 >-#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); >=20 >-#ifdef RTE_EAL_VFIO >+#ifdef VFIO_PRESENT > /* Set interrupt mode based on resource counts and system > * capabilities > */ >--=20 >1.9.1 >