@@ -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 )
@@ -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);
@@ -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);
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> --- 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(-)