[Xen-devel] xen/arm: traps: Remove all zero padding before PRIregister format

Message ID 20190814093607.22927-1-julien.grall@arm.com
State New
Headers show
Series
  • [Xen-devel] xen/arm: traps: Remove all zero padding before PRIregister format
Related show

Commit Message

Julien Grall Aug. 14, 2019, 9:36 a.m.
Commit af156ff085 "xen/arm: types: Specify the zero padding in the
definition of PRIregister" moved the zero padding within the definition
of PRIregister.

However, some of the users still had zero padding before which result
to print tens of zero when dumping the CPU state.

To prevent this, remove the last users of zero padding before
PRIregister.

Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/traps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Volodymyr Babchuk Aug. 14, 2019, 11:18 a.m. | #1
Hi Julien,

Julien Grall writes:

> Commit af156ff085 "xen/arm: types: Specify the zero padding in the
> definition of PRIregister" moved the zero padding within the definition
> of PRIregister.
>
> However, some of the users still had zero padding before which result
> to print tens of zero when dumping the CPU state.
>
> To prevent this, remove the last users of zero padding before
> PRIregister.
>
> Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Volodymyr Babchuk <volodymyr.babchuk@epam.com>

> ---
>  xen/arch/arm/traps.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index f062ae6f6a..a3b961bd06 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -938,7 +938,7 @@ static void _show_registers(const struct cpu_user_regs *regs,
>      printk(" TTBR0_EL2: %016"PRIx64"\n", READ_SYSREG64(TTBR0_EL2));
>      printk("\n");
>      printk("   ESR_EL2: %08"PRIx32"\n", regs->hsr);
> -    printk(" HPFAR_EL2: %016"PRIregister"\n", READ_SYSREG(HPFAR_EL2));
> +    printk(" HPFAR_EL2: %"PRIregister"\n", READ_SYSREG(HPFAR_EL2));
>  
>  #ifdef CONFIG_ARM_32
>      printk("     HDFAR: %08"PRIx32"\n", READ_CP32(HDFAR));
> @@ -1759,7 +1759,7 @@ void dump_guest_s1_walk(struct domain *d, vaddr_t addr)
>      mfn = gfn_to_mfn(d, gaddr_to_gfn(ttbr0));
>  
>      printk("dom%d VA 0x%08"PRIvaddr"\n", d->domain_id, addr);
> -    printk("    TTBCR: 0x%08"PRIregister"\n", ttbcr);
> +    printk("    TTBCR: 0x%"PRIregister"\n", ttbcr);
>      printk("    TTBR0: 0x%016"PRIx64" = 0x%"PRIpaddr"\n",
>             ttbr0, mfn_to_maddr(mfn));
Stefano Stabellini Aug. 27, 2019, 8:16 p.m. | #2
On Wed, 14 Aug 2019, Volodymyr Babchuk wrote:
> Hi Julien,
> 
> Julien Grall writes:
> 
> > Commit af156ff085 "xen/arm: types: Specify the zero padding in the
> > definition of PRIregister" moved the zero padding within the definition
> > of PRIregister.
> >
> > However, some of the users still had zero padding before which result
> > to print tens of zero when dumping the CPU state.
> >
> > To prevent this, remove the last users of zero padding before
> > PRIregister.
> >
> > Signed-off-by: Julien Grall <julien.grall@arm.com>
> Reviewed-by: Volodymyr Babchuk <volodymyr.babchuk@epam.com>

Thanks, committed

> > ---
> >  xen/arch/arm/traps.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> > index f062ae6f6a..a3b961bd06 100644
> > --- a/xen/arch/arm/traps.c
> > +++ b/xen/arch/arm/traps.c
> > @@ -938,7 +938,7 @@ static void _show_registers(const struct cpu_user_regs *regs,
> >      printk(" TTBR0_EL2: %016"PRIx64"\n", READ_SYSREG64(TTBR0_EL2));
> >      printk("\n");
> >      printk("   ESR_EL2: %08"PRIx32"\n", regs->hsr);
> > -    printk(" HPFAR_EL2: %016"PRIregister"\n", READ_SYSREG(HPFAR_EL2));
> > +    printk(" HPFAR_EL2: %"PRIregister"\n", READ_SYSREG(HPFAR_EL2));
> >  
> >  #ifdef CONFIG_ARM_32
> >      printk("     HDFAR: %08"PRIx32"\n", READ_CP32(HDFAR));
> > @@ -1759,7 +1759,7 @@ void dump_guest_s1_walk(struct domain *d, vaddr_t addr)
> >      mfn = gfn_to_mfn(d, gaddr_to_gfn(ttbr0));
> >  
> >      printk("dom%d VA 0x%08"PRIvaddr"\n", d->domain_id, addr);
> > -    printk("    TTBCR: 0x%08"PRIregister"\n", ttbcr);
> > +    printk("    TTBCR: 0x%"PRIregister"\n", ttbcr);
> >      printk("    TTBR0: 0x%016"PRIx64" = 0x%"PRIpaddr"\n",
> >             ttbr0, mfn_to_maddr(mfn));
> 
> 
> -- 
> Volodymyr Babchuk at EPAM

Patch

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index f062ae6f6a..a3b961bd06 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -938,7 +938,7 @@  static void _show_registers(const struct cpu_user_regs *regs,
     printk(" TTBR0_EL2: %016"PRIx64"\n", READ_SYSREG64(TTBR0_EL2));
     printk("\n");
     printk("   ESR_EL2: %08"PRIx32"\n", regs->hsr);
-    printk(" HPFAR_EL2: %016"PRIregister"\n", READ_SYSREG(HPFAR_EL2));
+    printk(" HPFAR_EL2: %"PRIregister"\n", READ_SYSREG(HPFAR_EL2));
 
 #ifdef CONFIG_ARM_32
     printk("     HDFAR: %08"PRIx32"\n", READ_CP32(HDFAR));
@@ -1759,7 +1759,7 @@  void dump_guest_s1_walk(struct domain *d, vaddr_t addr)
     mfn = gfn_to_mfn(d, gaddr_to_gfn(ttbr0));
 
     printk("dom%d VA 0x%08"PRIvaddr"\n", d->domain_id, addr);
-    printk("    TTBCR: 0x%08"PRIregister"\n", ttbcr);
+    printk("    TTBCR: 0x%"PRIregister"\n", ttbcr);
     printk("    TTBR0: 0x%016"PRIx64" = 0x%"PRIpaddr"\n",
            ttbr0, mfn_to_maddr(mfn));