From patchwork Wed Apr 30 18:06:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 29442 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 31C4A202FE for ; Wed, 30 Apr 2014 18:09:10 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 131sf2096480ykp.5 for ; Wed, 30 Apr 2014 11:09:09 -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:cc:subject :precedence:list-id:list-unsubscribe:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive :content-type:content-transfer-encoding; bh=xyjZTuaw6t4vIgJ3btVA/laHIJPmv/YrdTPx3kGu5n8=; b=TFOK+UpO1QQ32hY8cyHqugts/qCt/BEQS4CY6KdA793hkh7PX76NkZsfwqxkPhmlJI xXMAgKvg3WUO21U1uzEOY0JON5HtK7pV2VXL6QdbUtZ0j6cR8bLVpwCh1NZH0S181yzf rHY6kv/D1iviB7vFtdfWrB6WJ+3KtPGdLli9pwyFGAiiC6JOsXua/V2ICPfDg2wUtD+P OtxjztPdFEWptWn9dl1kzfzKXIKB+R9tOfxaeOqpBdGZvpYpLRioBdO6ffP8FDWVYfML KerGeGql3t8NTAMxSh99mbmlexuYhUrNrGZ61G74fhA8PjLhS4L743KR8693q0it33rR 689A== X-Gm-Message-State: ALoCoQn5lRgHfghHnfkaQBef372hosXr/xZF8sJt9T2dTJSUVdjD7iT1JBswRccJZxz7DVd71gWY X-Received: by 10.236.171.169 with SMTP id r29mr2784499yhl.32.1398881349922; Wed, 30 Apr 2014 11:09:09 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.40 with SMTP id 37ls700783qgk.32.gmail; Wed, 30 Apr 2014 11:09:09 -0700 (PDT) X-Received: by 10.221.66.131 with SMTP id xq3mr861597vcb.43.1398881349805; Wed, 30 Apr 2014 11:09:09 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id jl10si5500596veb.123.2014.04.30.11.09.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 11:09:09 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so2677995vcb.35 for ; Wed, 30 Apr 2014 11:09:09 -0700 (PDT) X-Received: by 10.58.187.9 with SMTP id fo9mr4774507vec.4.1398881349735; Wed, 30 Apr 2014 11:09:09 -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.220.221.72 with SMTP id ib8csp299636vcb; Wed, 30 Apr 2014 11:09:09 -0700 (PDT) X-Received: by 10.220.113.207 with SMTP id b15mr856956vcq.55.1398881349330; Wed, 30 Apr 2014 11:09:09 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id gx4si5505515vcb.1.2014.04.30.11.09.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 30 Apr 2014 11:09:09 -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 1WfYuH-00037T-7x; Wed, 30 Apr 2014 18:06:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WfYuG-00037D-0a for xen-devel@lists.xenproject.org; Wed, 30 Apr 2014 18:06:56 +0000 Received: from [193.109.254.147:5700] by server-5.bemta-14.messagelabs.com id 22/08-26413-FBB31635; Wed, 30 Apr 2014 18:06:55 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1398881214!1931893!1 X-Originating-IP: [74.125.83.42] 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 25904 invoked from network); 30 Apr 2014 18:06:54 -0000 Received: from mail-ee0-f42.google.com (HELO mail-ee0-f42.google.com) (74.125.83.42) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 30 Apr 2014 18:06:54 -0000 Received: by mail-ee0-f42.google.com with SMTP id d17so1669300eek.1 for ; Wed, 30 Apr 2014 11:06:54 -0700 (PDT) X-Received: by 10.14.183.7 with SMTP id p7mr5676007eem.107.1398881214367; Wed, 30 Apr 2014 11:06:54 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id h47sm69706960eey.13.2014.04.30.11.06.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Apr 2014 11:06:53 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 30 Apr 2014 19:06:51 +0100 Message-Id: <1398881211-10708-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH] xen/arm: vtimer: rename vcpu_domain_init into domain_vtimer_init 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: , MIME-Version: 1.0 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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 current function name vcpu_domain_init doesn't reflect what the function does and might be misused. Rename it into domain_vtimer_init. Signed-off-by: Julien Grall --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/vtimer.c | 2 +- xen/arch/arm/vtimer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index c47db4a..5ce1059 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -519,7 +519,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = domain_vgic_init(d)) != 0 ) goto fail; - if ( (rc = vcpu_domain_init(d)) != 0 ) + if ( (rc == domain_vtimer_init(d)) != 0 ) goto fail; if ( d->domain_id ) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index c515e7e..f68d16a 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -44,7 +44,7 @@ static void virt_timer_expired(void *data) vgic_vcpu_inject_irq(t->v, t->irq, 1); } -int vcpu_domain_init(struct domain *d) +int domain_vtimer_init(struct domain *d) { d->arch.phys_timer_base.offset = NOW(); d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0); diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h index bcf910e..6d2e46e 100644 --- a/xen/arch/arm/vtimer.h +++ b/xen/arch/arm/vtimer.h @@ -20,7 +20,7 @@ #ifndef __ARCH_ARM_VTIMER_H__ #define __ARCH_ARM_VTIMER_H__ -extern int vcpu_domain_init(struct domain *d); +extern int domain_vtimer_init(struct domain *d); extern int vcpu_vtimer_init(struct vcpu *v); extern int vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr); extern int virt_timer_save(struct vcpu *v);