Re: [kvm-unit-tests PATCH 3/8] s390x: pfmf: Initialize pfmf_r1 union on declaration

[Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>]

On Tue,  5 Apr 2022 07:52:20 +0000
Janosch Frank <frankja@xxxxxxxxxxxxx> wrote:

> Let's make this test look a bit nicer.
> 
> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>

Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>

> ---
>  s390x/pfmf.c | 39 +++++++++++++++++++--------------------
>  1 file changed, 19 insertions(+), 20 deletions(-)
> 
> diff --git a/s390x/pfmf.c b/s390x/pfmf.c
> index aa130529..178abb5a 100644
> --- a/s390x/pfmf.c
> +++ b/s390x/pfmf.c
> @@ -28,7 +28,11 @@ static void test_priv(void)
>  
>  static void test_4k_key(void)
>  {
> -	union pfmf_r1 r1;
> +	union pfmf_r1 r1 = {
> +		.reg.sk = 1,
> +		.reg.fsc = PFMF_FSC_4K,
> +		.reg.key = 0x30,
> +	};
>  	union skey skey;
>  
>  	report_prefix_push("4K");
> @@ -36,10 +40,6 @@ static void test_4k_key(void)
>  		report_skip("storage key removal facility is active");
>  		goto out;
>  	}
> -	r1.val = 0;
> -	r1.reg.sk = 1;
> -	r1.reg.fsc = PFMF_FSC_4K;
> -	r1.reg.key = 0x30;
>  	pfmf(r1.val, pagebuf);
>  	skey.val = get_storage_key(pagebuf);
>  	skey.val &= SKEY_ACC | SKEY_FP;
> @@ -52,18 +52,19 @@ static void test_1m_key(void)
>  {
>  	int i;
>  	bool rp = true;
> -	union pfmf_r1 r1;
>  	union skey skey;
> +	union pfmf_r1 r1 = {
> +		.reg.fsc = PFMF_FSC_1M,
> +		.reg.key = 0x30,
> +		.reg.sk = 1,
> +	};
>  
>  	report_prefix_push("1M");
>  	if (test_facility(169)) {
>  		report_skip("storage key removal facility is active");
>  		goto out;
>  	}
> -	r1.val = 0;
> -	r1.reg.sk = 1;
> -	r1.reg.fsc = PFMF_FSC_1M;
> -	r1.reg.key = 0x30;
> +
>  	pfmf(r1.val, pagebuf);
>  	for (i = 0; i < 256; i++) {
>  		skey.val = get_storage_key(pagebuf + i * PAGE_SIZE);
> @@ -80,11 +81,10 @@ out:
>  
>  static void test_4k_clear(void)
>  {
> -	union pfmf_r1 r1;
> -
> -	r1.val = 0;
> -	r1.reg.cf = 1;
> -	r1.reg.fsc = PFMF_FSC_4K;
> +	union pfmf_r1 r1 = {
> +		.reg.cf = 1,
> +		.reg.fsc = PFMF_FSC_4K,
> +	};
>  
>  	report_prefix_push("4K");
>  	memset(pagebuf, 42, PAGE_SIZE);
> @@ -97,13 +97,12 @@ static void test_4k_clear(void)
>  static void test_1m_clear(void)
>  {
>  	int i;
> -	union pfmf_r1 r1;
> +	union pfmf_r1 r1 = {
> +		.reg.cf = 1,
> +		.reg.fsc = PFMF_FSC_1M,
> +	};
>  	unsigned long sum = 0;
>  
> -	r1.val = 0;
> -	r1.reg.cf = 1;
> -	r1.reg.fsc = PFMF_FSC_1M;
> -
>  	report_prefix_push("1M");
>  	memset(pagebuf, 42, PAGE_SIZE * 256);
>  	pfmf(r1.val, pagebuf);