From: Julien Grall <julien.grall@linaro.org>
Date: Thu, 1 May 2014 12:31:15 +0000 (+0100)
Subject: xen/arm: vtimer: rename vcpu_domain_init into domain_vtimer_init
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5070
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e796bc30ab39915884e4de5e808b450b6c92cd30;p=xen.git

xen/arm: vtimer: rename vcpu_domain_init into domain_vtimer_init

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 <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 3faf7a69fd..40f1c3a089 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -517,7 +517,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 4822d4fe30..b93153ea75 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 bcf910e580..6d2e46efe2 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);