From patchwork Mon Jun 23 13:27:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 32355 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD70620540 for ; Mon, 23 Jun 2014 13:30:20 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id j17sf43061874oag.8 for ; Mon, 23 Jun 2014 06:30: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:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=1YXZI5JV7G92n1uvTWjo+WVn/PyVbv+Qt+O8sI0uzBE=; b=FXA3lJPRvk2OYbE4AN9iNH6hDnuW1+mdcWvxyd2tzVZxGaRM0J2m8e3P83zHNmDRl9 XcpuXkoNgO0mixi3TBrBj57IiGKMNxtPpMYjs07Dy3SPgEr9RJFkS0ShXbh5E6VDQJBZ adYxNaftt7vxzvF8YqL5K8jiDpKQNorCymB7wO5TvpyFQCdTnWKJFLHsI+n5GdEvJyFP YaRThjAz7T1wUC0xWmejGUtvweB5INn/xg/LwkUoNY5f8ppG47mEruoiW9tcN9yKoQcP OEEzyXmy0i58PmEI2xAQSW0WfSl5LMJwbkvcgrsctcU/LDqvhT3xWu9Sx/nobtWcNfkq Hwmw== X-Gm-Message-State: ALoCoQlfJDUChG4ggZDr/W9J+69NvPjPtZbCudUGjgsuSClqeEyCBcme8NplQR2GJPWRcYRAuZcd X-Received: by 10.182.51.228 with SMTP id n4mr9910278obo.28.1403530220288; Mon, 23 Jun 2014 06:30:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.33.202 with SMTP id j68ls1892824qgj.28.gmail; Mon, 23 Jun 2014 06:30:20 -0700 (PDT) X-Received: by 10.220.53.72 with SMTP id l8mr19418192vcg.16.1403530220104; Mon, 23 Jun 2014 06:30:20 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id u5si8981855vcr.104.2014.06.23.06.30.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Jun 2014 06:30:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hy4so5895111vcb.20 for ; Mon, 23 Jun 2014 06:30:20 -0700 (PDT) X-Received: by 10.58.24.38 with SMTP id r6mr1478550vef.41.1403530220000; Mon, 23 Jun 2014 06:30:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp130788vcb; Mon, 23 Jun 2014 06:30:19 -0700 (PDT) X-Received: by 10.50.12.66 with SMTP id w2mr11215021igb.37.1403530219454; Mon, 23 Jun 2014 06:30:19 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id k2si20423968igu.2.2014.06.23.06.30.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 23 Jun 2014 06:30:19 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wz4I7-0001co-2u; Mon, 23 Jun 2014 13:28:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wz4I6-0001cj-Hi for xen-devel@lists.xenproject.org; Mon, 23 Jun 2014 13:28:10 +0000 Received: from [193.109.254.147:28340] by server-14.bemta-14.messagelabs.com id A9/AC-08195-96B28A35; Mon, 23 Jun 2014 13:28:09 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1403530088!13071469!1 X-Originating-IP: [209.85.212.175] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12806 invoked from network); 23 Jun 2014 13:28:08 -0000 Received: from mail-wi0-f175.google.com (HELO mail-wi0-f175.google.com) (209.85.212.175) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 23 Jun 2014 13:28:08 -0000 Received: by mail-wi0-f175.google.com with SMTP id r20so4361132wiv.14 for ; Mon, 23 Jun 2014 06:28:08 -0700 (PDT) X-Received: by 10.194.222.197 with SMTP id qo5mr28629956wjc.78.1403530088304; Mon, 23 Jun 2014 06:28:08 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id o3sm33406498wiz.24.2014.06.23.06.28.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2014 06:28:07 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 23 Jun 2014 14:27:58 +0100 Message-Id: <1403530078-13640-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Cc: ian.campbell@citrix.com, Ian Jackson , Julien Grall , tim@xen.org, stefano.stabellini@citrix.com, Jan Beulich , Aravindh Puthiyaparambil Subject: [Xen-devel] [PATCH] libxc: Fix xc_mem_event.c compilation for ARM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The commit 6ae2df9 "mem_access: Add helper API to setup ring and enable mem_access¨ break libxc compilation for ARM. This is because xc_map_foreign_map and xc_domain_decrease_reservation_exact is taking an xen_pfn_t in parameters. On ARM, xen_pfn_t is always an uin64_t. Signed-off-by: Julien Grall Cc: Aravindh Puthiyaparambil Cc: Jan Beulich Cc: Ian Jackson --- tools/libxc/xc_mem_event.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_mem_event.c b/tools/libxc/xc_mem_event.c index be7c63d..0b2eecb 100644 --- a/tools/libxc/xc_mem_event.c +++ b/tools/libxc/xc_mem_event.c @@ -60,7 +60,8 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, uint32_t *port) { void *ring_page = NULL; - unsigned long ring_pfn, mmap_pfn; + unsigned long pfn; + xen_pfn_t ring_pfn, mmap_pfn; unsigned int op, mode; int rc1, rc2, saved_errno; @@ -79,14 +80,15 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, } /* Get the pfn of the ring page */ - rc1 = xc_get_hvm_param(xch, domain_id, param, &ring_pfn); + rc1 = xc_get_hvm_param(xch, domain_id, param, &pfn); if ( rc1 != 0 ) { PERROR("Failed to get pfn of ring page\n"); goto out; } - mmap_pfn = ring_pfn; + ring_pfn = pfn; + mmap_pfn = pfn; ring_page = xc_map_foreign_batch(xch, domain_id, PROT_READ | PROT_WRITE, &mmap_pfn, 1); if ( mmap_pfn & XEN_DOMCTL_PFINFO_XTAB )