From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 338461B267 for ; Thu, 19 Oct 2017 18:43:57 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Oct 2017 09:43:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,402,1503385200"; d="scan'208";a="1232779986" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 19 Oct 2017 09:43:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 19 Oct 2017 17:36:24 +0100 Message-Id: <20171019163629.28618-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH 0/5] Merge Linux and BSD EAL map files X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Oct 2017 16:43:58 -0000 Both Linux and BSD EALs should provide exactly the same set of functions to the user, even if in some cases the function is a stub returning ENOTSUP. Because of this we should only need a single version.map file for all of EAL - not one each for Linux and FreeBSD. Unfortunately, there was some inconsistencies in the two EALs, specifically 4 functions were missing from the BSD interrupts files. As part of adding the needed stubs, I also discovered that there was nothing terribly Linux-specific about the Linux-specific rte_interrupts.h file, which appeared to contain a superset of the BSD contents. Therefore, this file could be made common also. The net result is that there are now zero BSD-specific EAL headers, and only a single Linux one for KNI. The version.map file is now moved to a common location also, just inside rte_eal directory. [While an argument could be made to put it in common, this location works best for integration with the existing meson build-sysetm work. It also allows the same version file to be used for non-posix-like environments which may not use the "common" folder as much] Bruce Richardson (5): eal/bsdapp: align interrupt include file with Linux version eal/bsdapp: fix missing interrupt stub functions eal: merge bsdapp and linuxapp interrupt headers eal: mark internal interrupts file as such to doxygen eal: use a single version map file lib/librte_eal/bsdapp/eal/Makefile | 4 +- lib/librte_eal/bsdapp/eal/eal_interrupts.c | 35 +++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 137 ----------- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 250 --------------------- lib/librte_eal/common/Makefile | 3 +- .../include/rte_eal_interrupts.h} | 24 +- lib/librte_eal/common/include/rte_interrupts.h | 2 +- lib/librte_eal/linuxapp/eal/Makefile | 4 +- .../{linuxapp/eal => }/rte_eal_version.map | 0 9 files changed, 59 insertions(+), 400 deletions(-) delete mode 100644 lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h delete mode 100644 lib/librte_eal/bsdapp/eal/rte_eal_version.map rename lib/librte_eal/{linuxapp/eal/include/exec-env/rte_interrupts.h => common/include/rte_eal_interrupts.h} (93%) rename lib/librte_eal/{linuxapp/eal => }/rte_eal_version.map (100%) -- 2.13.6