Re: [PATCH 2/2] selftests: KVM: s390: fix format strings for access reg test

[Janosch Frank <frankja@xxxxxxxxxxxxx>]

On 3/11/20 2:10 PM, Christian Borntraeger wrote:
> acrs are 32 bit and not 64 bit.
> 
> Reported-by: Andrew Jones <drjones@xxxxxxxxxx>
> Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>

Acked-by: Janosch Frank <frankja@xxxxxxxxxxxxx>

> ---
>  tools/testing/selftests/kvm/s390x/sync_regs_test.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/s390x/sync_regs_test.c b/tools/testing/selftests/kvm/s390x/sync_regs_test.c
> index b705637ca14b..70a56580042b 100644
> --- a/tools/testing/selftests/kvm/s390x/sync_regs_test.c
> +++ b/tools/testing/selftests/kvm/s390x/sync_regs_test.c
> @@ -42,6 +42,13 @@ static void guest_code(void)
>  		    " values did not match: 0x%llx, 0x%llx\n", \
>  		    left->reg, right->reg)
>  
> +#define REG_COMPARE32(reg) \
> +	TEST_ASSERT(left->reg == right->reg, \
> +		    "Register " #reg \
> +		    " values did not match: 0x%x, 0x%x\n", \
> +		    left->reg, right->reg)
> +
> +

One \n too much?

>  static void compare_regs(struct kvm_regs *left, struct kvm_sync_regs *right)
>  {
>  	int i;
> @@ -55,7 +62,7 @@ static void compare_sregs(struct kvm_sregs *left, struct kvm_sync_regs *right)
>  	int i;
>  
>  	for (i = 0; i < 16; i++)
> -		REG_COMPARE(acrs[i]);
> +		REG_COMPARE32(acrs[i]);
>  
>  	for (i = 0; i < 16; i++)
>  		REG_COMPARE(crs[i]);
> @@ -155,7 +162,7 @@ int main(int argc, char *argv[])
>  		    "r11 sync regs value incorrect 0x%llx.",
>  		    run->s.regs.gprs[11]);
>  	TEST_ASSERT(run->s.regs.acrs[0]  == 1 << 11,
> -		    "acr0 sync regs value incorrect 0x%llx.",
> +		    "acr0 sync regs value incorrect 0x%x.",
>  		    run->s.regs.acrs[0]);
>  
>  	vcpu_regs_get(vm, VCPU_ID, &regs);
>

Attachment: signature.asc
Description: OpenPGP digital signature