From patchwork Wed Jan 29 12:11:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 23834 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB91A202FA for ; Wed, 29 Jan 2014 12:13:55 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wo20sf5647201obc.11 for ; Wed, 29 Jan 2014 04:13:55 -0800 (PST) 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:in-reply-to :references: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=LtfKwT/0TajldaIBYTr8n3OsF38i5vhbJqfEi9y9mZA=; b=CdcxCSGK+0RefJWnitCIqT+1K3nEijC47jpTnTeE6ZaU6O6kCXpIvTx58tkRbxLDJ6 WdaV8nhcExqR/F+LMlePz5aRposaID8EhPuTxzMJ6eNnF4AYgDTFBvVHRasItUlweOk4 LB5p6nULJfgu0HYrE6s2QYaDyEXf2pQu7z70NM0uk5SOrHNORnnIfSkUCNO79KFv9RsJ rRvhPnZNtuTg4/WJzA5qY6Msmw+fTYZJJANISFq97pKvIIU8mb5yzA/x441JEBFnT/AZ y+zN07zFUZN5l/sNG40eNaaAUeyBf+s92DG/FlI04Ui/6Devlo9ENHEFk53LP6P3nGY6 BOMw== X-Gm-Message-State: ALoCoQn3+k/xa77+XbWBzLEejhTr2KCgVmm4Sd8Zn5G2YwtBczGdBPkd0N5QmRyNzRGZ46l5/I0Z X-Received: by 10.182.81.7 with SMTP id v7mr2788596obx.28.1390997635093; Wed, 29 Jan 2014 04:13:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.38 with SMTP id u35ls70925qgd.60.gmail; Wed, 29 Jan 2014 04:13:54 -0800 (PST) X-Received: by 10.52.188.41 with SMTP id fx9mr5301071vdc.19.1390997634908; Wed, 29 Jan 2014 04:13:54 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id e5si720954vcf.146.2014.01.29.04.13.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 04:13:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id p5so1067232vbn.16 for ; Wed, 29 Jan 2014 04:13:54 -0800 (PST) X-Received: by 10.52.104.68 with SMTP id gc4mr5322524vdb.2.1390997634828; Wed, 29 Jan 2014 04:13:54 -0800 (PST) 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.220.174.196 with SMTP id u4csp107839vcz; Wed, 29 Jan 2014 04:13:54 -0800 (PST) X-Received: by 10.224.161.5 with SMTP id p5mr11286966qax.32.1390997634303; Wed, 29 Jan 2014 04:13:54 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id eo3si709302qcb.0.2014.01.29.04.13.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 04:13:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1W8Tza-0005jK-OL; Wed, 29 Jan 2014 12:11:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W8TzZ-0005j1-12 for xen-devel@lists.xen.org; Wed, 29 Jan 2014 12:11:41 +0000 Received: from [85.158.143.35:54428] by server-2.bemta-4.messagelabs.com id 86/48-10891-CFFE8E25; Wed, 29 Jan 2014 12:11:40 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1390997497!1622469!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4436 invoked from network); 29 Jan 2014 12:11:39 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 29 Jan 2014 12:11:39 -0000 X-IronPort-AV: E=Sophos;i="4.95,741,1384300800"; d="scan'208";a="97649451" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 29 Jan 2014 12:11:28 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Wed, 29 Jan 2014 07:11:27 -0500 Received: from drall.uk.xensource.com ([10.80.16.71] helo=drall.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1W8TzK-0000ow-CS; Wed, 29 Jan 2014 12:11:26 +0000 From: Ian Campbell To: Date: Wed, 29 Jan 2014 12:11:24 +0000 Message-ID: <1390997486-3986-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390997452.31814.90.camel@kazak.uk.xensource.com> References: <1390997452.31814.90.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , julien.grall@linaro.org, tim@xen.org, george.dunlap@citrix.com, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH 2/4] xen: arm: rename create_p2m_entries to apply_p2m_changes 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: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: This function hasn't been only about creating for quite a while. This is purely a rename. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 85ca330..ace3c54 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -230,7 +230,7 @@ enum p2m_operation { RELINQUISH, }; -static int create_p2m_entries(struct domain *d, +static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, paddr_t end_gpaddr, @@ -438,8 +438,8 @@ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end) { - return create_p2m_entries(d, ALLOCATE, start, end, - 0, MATTR_MEM, p2m_ram_rw); + return apply_p2m_changes(d, ALLOCATE, start, end, + 0, MATTR_MEM, p2m_ram_rw); } int map_mmio_regions(struct domain *d, @@ -447,8 +447,8 @@ int map_mmio_regions(struct domain *d, paddr_t end_gaddr, paddr_t maddr) { - return create_p2m_entries(d, INSERT, start_gaddr, end_gaddr, - maddr, MATTR_DEV, p2m_mmio_direct); + return apply_p2m_changes(d, INSERT, start_gaddr, end_gaddr, + maddr, MATTR_DEV, p2m_mmio_direct); } int guest_physmap_add_entry(struct domain *d, @@ -457,20 +457,20 @@ int guest_physmap_add_entry(struct domain *d, unsigned long page_order, p2m_type_t t) { - return create_p2m_entries(d, INSERT, - pfn_to_paddr(gpfn), - pfn_to_paddr(gpfn + (1 << page_order)), - pfn_to_paddr(mfn), MATTR_MEM, t); + return apply_p2m_changes(d, INSERT, + pfn_to_paddr(gpfn), + pfn_to_paddr(gpfn + (1 << page_order)), + pfn_to_paddr(mfn), MATTR_MEM, t); } void guest_physmap_remove_page(struct domain *d, unsigned long gpfn, unsigned long mfn, unsigned int page_order) { - create_p2m_entries(d, REMOVE, - pfn_to_paddr(gpfn), - pfn_to_paddr(gpfn + (1<arch.p2m; - return create_p2m_entries(d, RELINQUISH, + return apply_p2m_changes(d, RELINQUISH, pfn_to_paddr(p2m->next_gfn_to_relinquish), pfn_to_paddr(p2m->max_mapped_gfn), pfn_to_paddr(INVALID_MFN),