Re: [Xen-devel] [PATCH 1/3] xen/arm: arm32: Rename the trap to the correct name

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Thu, 4 May 2017, Julien Grall wrote:
> Per Table B1-3 in ARM DDI 0406C.c, the vector 0x8 for hyp is called
> "Hypervisor Call".
> 
> Signed-off-by: Julien Grall <julien.grall@xxxxxxx>

Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> ---
>  xen/arch/arm/arm32/entry.S | 4 ++--
>  xen/arch/arm/arm32/traps.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
> index 2b04a99664..05733089f7 100644
> --- a/xen/arch/arm/arm32/entry.S
> +++ b/xen/arch/arm/arm32/entry.S
> @@ -149,7 +149,7 @@ trap_##trap:                                              
>               \
>  GLOBAL(hyp_traps_vector)
>          .word 0                         /* 0x00 - Reset */
>          b trap_undefined_instruction    /* 0x04 - Undefined Instruction */
> -        b trap_supervisor_call          /* 0x08 - Supervisor Call */
> +        b trap_hypervisor_call          /* 0x08 - Hypervisor Call */
>          b trap_prefetch_abort           /* 0x0c - Prefetch Abort */
>          b trap_data_abort               /* 0x10 - Data Abort */
>          b trap_hypervisor               /* 0x14 - Hypervisor */
> @@ -157,7 +157,7 @@ GLOBAL(hyp_traps_vector)
>          b trap_fiq                      /* 0x1c - FIQ */
>  
>  DEFINE_TRAP_ENTRY(undefined_instruction)
> -DEFINE_TRAP_ENTRY(supervisor_call)
> +DEFINE_TRAP_ENTRY(hypervisor_call)
>  DEFINE_TRAP_ENTRY(prefetch_abort)
>  DEFINE_TRAP_ENTRY(hypervisor)
>  DEFINE_TRAP_ENTRY_NOIRQ(irq)
> diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c
> index 5bc5f64d86..e75836792a 100644
> --- a/xen/arch/arm/arm32/traps.c
> +++ b/xen/arch/arm/arm32/traps.c
> @@ -50,9 +50,9 @@ die:
>      do_unexpected_trap("Undefined Instruction", regs);
>  }
>  
> -asmlinkage void do_trap_supervisor_call(struct cpu_user_regs *regs)
> +asmlinkage void do_trap_hypervisor_call(struct cpu_user_regs *regs)
>  {
> -    do_unexpected_trap("Supervisor Call", regs);
> +    do_unexpected_trap("Hypervisor Call", regs);
>  }
>  
>  asmlinkage void do_trap_prefetch_abort(struct cpu_user_regs *regs)
> -- 
> 2.11.0
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel