From patchwork Fri Jan 23 05:35:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jijiang Liu X-Patchwork-Id: 2492 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 7A4005ADA; Fri, 23 Jan 2015 06:36:01 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id ECDDB5ACD for ; Fri, 23 Jan 2015 06:35:54 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 22 Jan 2015 21:35:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,453,1418112000"; d="scan'208";a="666286569" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga002.fm.intel.com with ESMTP; 22 Jan 2015 21:35:52 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t0N5ZoUt003692; Fri, 23 Jan 2015 13:35:50 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t0N5ZlC5022009; Fri, 23 Jan 2015 13:35:49 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0N5Zl3g022005; Fri, 23 Jan 2015 13:35:47 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Fri, 23 Jan 2015 13:35:39 +0800 Message-Id: <1421991340-21960-3-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1421991340-21960-1-git-send-email-jijiang.liu@intel.com> References: <1421991340-21960-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH 2/3] lib/xen:DPDK dom0 Driver change 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" Fixed all the compilation issues due to using SUSE Linux 11 SP3. Signed-off-by: Jijiang Liu --- lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c index 543bf57..2715826 100644 --- a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c +++ b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c @@ -67,7 +67,7 @@ #include #include -#include +#include #include #include @@ -392,7 +392,7 @@ find_memseg(int count, struct dom0_mm_data * mm_data) static int dom0_memory_reserve(uint32_t rsv_size) { - uint64_t pfn, vstart, vaddr; + uint64_t pfn, mfn, vstart, vaddr; uint32_t i, num_block, size, allocated_size = 0; #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) @@ -429,7 +429,8 @@ dom0_memory_reserve(uint32_t rsv_size) size -= PAGE_SIZE; } - pfn = virt_to_pfn(vstart); + mfn = virt_to_mfn(vstart); + pfn = mfn_to_pfn(mfn); rsv_mm_info[i].pfn = pfn; rsv_mm_info[i].vir_addr = vstart; rsv_mm_info[i + 1].pfn = @@ -457,7 +458,8 @@ dom0_memory_reserve(uint32_t rsv_size) vaddr += PAGE_SIZE; size -= PAGE_SIZE; } - pfn = virt_to_pfn(vstart); + mfn = virt_to_mfn(vstart); + pfn = mfn_to_pfn(mfn); rsv_mm_info[i].pfn = pfn; rsv_mm_info[i].vir_addr = vstart; }