From patchwork Tue Feb 4 14:22:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24103 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 37848202FA for ; Tue, 4 Feb 2014 14:24:19 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id j1sf16000027iga.0 for ; Tue, 04 Feb 2014 06:24:18 -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=K2mji8OkFO4yBSLU1UeKIizgHogHT5+VzjFjzycOskLVoLSl3k9oBWV78MfbvcQAri TPU3zklAUmJC656m/+7JvgyBs89jaW5JnlLMRinZ7GBbknibu63d58P2QZDd9BUsqWcK J4+lnx7qIeYfO/4MISZwTEALGzkmg5W21O3bWmyOhJ3TP3KDPnYAcJNtlC6c0rbPOtLg EYBiMLwYwfnmrYal8Gw0aKlSJWxcMQdS9tU94fhA5q+80GaWmnplRv+/zHb9Ld5c8W6u n2T9FI/3Z4uVjdnty1h6UyGlhRHVDJvdeC0maKxoP6B06B6OLxKDd/CROagkcaI2L017 tV6A== X-Gm-Message-State: ALoCoQksEirlzwUFZHpbJ7Y42T4L2wNfNJjxcnfvs107QVr/4lf4LnmLfdAQM5G1MrjpuM8Or4Ey X-Received: by 10.50.12.68 with SMTP id w4mr7976057igb.0.1391523858392; Tue, 04 Feb 2014 06:24:18 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.200 with SMTP id p66ls2248398qgp.74.gmail; Tue, 04 Feb 2014 06:24:18 -0800 (PST) X-Received: by 10.58.161.78 with SMTP id xq14mr57575veb.51.1391523858289; Tue, 04 Feb 2014 06:24:18 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id dr8si8217176vcb.88.2014.02.04.06.24.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 06:24:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu8so5984966vcb.1 for ; Tue, 04 Feb 2014 06:24:18 -0800 (PST) X-Received: by 10.220.106.84 with SMTP id w20mr33200179vco.18.1391523858110; Tue, 04 Feb 2014 06:24:18 -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 u4csp238131vcz; Tue, 4 Feb 2014 06:24:17 -0800 (PST) X-Received: by 10.224.122.20 with SMTP id j20mr21456909qar.82.1391523855920; Tue, 04 Feb 2014 06:24:15 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id a51si17762153qge.110.2014.02.04.06.24.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 04 Feb 2014 06:24:15 -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 1WAgtV-0006Ei-Ko; Tue, 04 Feb 2014 14:22:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAgtT-0006ED-JP for xen-devel@lists.xen.org; Tue, 04 Feb 2014 14:22:31 +0000 Received: from [85.158.139.211:4460] by server-2.bemta-5.messagelabs.com id 80/1B-23037-6A7F0F25; Tue, 04 Feb 2014 14:22:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1391523748!1583330!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2149 invoked from network); 4 Feb 2014 14:22:30 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 4 Feb 2014 14:22:30 -0000 X-IronPort-AV: E=Sophos;i="4.95,779,1384300800"; d="scan'208";a="97743707" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 04 Feb 2014 14:22:26 +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; Tue, 4 Feb 2014 09:22:26 -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 1WAgtN-0004zY-Q9; Tue, 04 Feb 2014 14:22:25 +0000 From: Ian Campbell To: Date: Tue, 4 Feb 2014 14:22:22 +0000 Message-ID: <1391523745-21139-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391523701.5635.6.camel@kazak.uk.xensource.com> References: <1391523701.5635.6.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v2 1/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.220.170 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 --- 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),