Re: [kvm-unit-tests PATCH v2 09/10] s390x: mvpg-sie: Use snippet helpers

[Claudio Imbrenda <imbrenda@linux.ibm.com>]

On Tue,  7 Dec 2021 16:00:04 +0000
Janosch Frank <frankja@linux.ibm.com> wrote:

> Time to use our shiny new snippet helpers.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

> ---
>  s390x/mvpg-sie.c | 24 ++++++++----------------
>  1 file changed, 8 insertions(+), 16 deletions(-)
> 
> diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c
> index d526069d..8ae9a52a 100644
> --- a/s390x/mvpg-sie.c
> +++ b/s390x/mvpg-sie.c
> @@ -21,17 +21,12 @@
>  #include <sie.h>
>  #include <snippet.h>
>  
> -static u8 *guest;
>  static struct vm vm;
>  
>  static uint8_t *src;
>  static uint8_t *dst;
>  static uint8_t *cmp;
>  
> -extern const char SNIPPET_NAME_START(c, mvpg_snippet)[];
> -extern const char SNIPPET_NAME_END(c, mvpg_snippet)[];
> -int binary_size;
> -
>  static void test_mvpg_pei(void)
>  {
>  	uint64_t **pei_dst = (uint64_t **)((uintptr_t) vm.sblk + 0xc0);
> @@ -78,9 +73,6 @@ static void test_mvpg_pei(void)
>  
>  static void test_mvpg(void)
>  {
> -	int binary_size = SNIPPET_LEN(c, mvpg_snippet);
> -
> -	memcpy(guest, SNIPPET_NAME_START(c, mvpg_snippet), binary_size);
>  	memset(src, 0x42, PAGE_SIZE);
>  	memset(dst, 0x43, PAGE_SIZE);
>  	sie(&vm);
> @@ -89,20 +81,20 @@ static void test_mvpg(void)
>  
>  static void setup_guest(void)
>  {
> +	extern const char SNIPPET_NAME_START(c, mvpg_snippet)[];
> +	extern const char SNIPPET_NAME_END(c, mvpg_snippet)[];
> +
>  	setup_vm();
>  
> -	/* Allocate 1MB as guest memory */
> -	guest = alloc_pages(8);
> +	snippet_setup_guest(&vm, false);
> +	snippet_init(&vm, SNIPPET_NAME_START(c, mvpg_snippet),
> +		     SNIPPET_LEN(c, mvpg_snippet), SNIPPET_OFF_C);
>  
> -	sie_guest_create(&vm, (uint64_t)guest, HPAGE_SIZE);
> -
> -	vm.sblk->gpsw = snippet_psw;
> -	vm.sblk->ictl = ICTL_OPEREXC | ICTL_PINT;
>  	/* Enable MVPG interpretation as we want to test KVM and not ourselves */
>  	vm.sblk->eca = ECA_MVPGI;
>  
> -	src = guest + PAGE_SIZE * 6;
> -	dst = guest + PAGE_SIZE * 5;
> +	src = (uint8_t *) vm.sblk->mso + PAGE_SIZE * 6;
> +	dst = (uint8_t *) vm.sblk->mso + PAGE_SIZE * 5;
>  	cmp = alloc_page();
>  	memset(cmp, 0, PAGE_SIZE);
>  }