diff mbox series

[kvm-unit-tests,v3,3/7] s390x: pv-diags: Drop snippet from snippet names

Message ID 20230421113647.134536-4-frankja@linux.ibm.com (mailing list archive)
State New, archived
Headers show
Series s390x: Add PV SIE intercepts and ipl tests | expand

Commit Message

Janosch Frank April 21, 2023, 11:36 a.m. UTC 
It's a bit redundant.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 s390x/Makefile                                |  6 +--
 s390x/pv-diags.c                              | 48 +++++++++----------
 .../{snippet-pv-diag-288.S => pv-diag-288.S}  |  0
 .../{snippet-pv-diag-500.S => pv-diag-500.S}  |  0
 ...nippet-pv-diag-yield.S => pv-diag-yield.S} |  0
 5 files changed, 27 insertions(+), 27 deletions(-)
 rename s390x/snippets/asm/{snippet-pv-diag-288.S => pv-diag-288.S} (100%)
 rename s390x/snippets/asm/{snippet-pv-diag-500.S => pv-diag-500.S} (100%)
 rename s390x/snippets/asm/{snippet-pv-diag-yield.S => pv-diag-yield.S} (100%)

Comments

Claudio Imbrenda April 21, 2023, 2:10 p.m. UTC | #1 
On Fri, 21 Apr 2023 11:36:43 +0000
Janosch Frank <frankja@linux.ibm.com> wrote:

> It's a bit redundant.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

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

> ---
>  s390x/Makefile                                |  6 +--
>  s390x/pv-diags.c                              | 48 +++++++++----------
>  .../{snippet-pv-diag-288.S => pv-diag-288.S}  |  0
>  .../{snippet-pv-diag-500.S => pv-diag-500.S}  |  0
>  ...nippet-pv-diag-yield.S => pv-diag-yield.S} |  0
>  5 files changed, 27 insertions(+), 27 deletions(-)
>  rename s390x/snippets/asm/{snippet-pv-diag-288.S => pv-diag-288.S} (100%)
>  rename s390x/snippets/asm/{snippet-pv-diag-500.S => pv-diag-500.S} (100%)
>  rename s390x/snippets/asm/{snippet-pv-diag-yield.S => pv-diag-yield.S} (100%)
> 
> diff --git a/s390x/Makefile b/s390x/Makefile
> index a80db538..8d1cfc7c 100644
> --- a/s390x/Makefile
> +++ b/s390x/Makefile
> @@ -122,9 +122,9 @@ snippet_lib = $(snippet_asmlib) lib/auxinfo.o
>  $(TEST_DIR)/mvpg-sie.elf: snippets = $(SNIPPET_DIR)/c/mvpg-snippet.gbin
>  $(TEST_DIR)/spec_ex-sie.elf: snippets = $(SNIPPET_DIR)/c/spec_ex.gbin
>  
> -$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-yield.gbin
> -$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-288.gbin
> -$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-500.gbin
> +$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-yield.gbin
> +$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-288.gbin
> +$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-500.gbin
>  
>  ifneq ($(GEN_SE_HEADER),)
>  snippets += $(pv-snippets)
> diff --git a/s390x/pv-diags.c b/s390x/pv-diags.c
> index 096ac61f..fa4e5532 100644
> --- a/s390x/pv-diags.c
> +++ b/s390x/pv-diags.c
> @@ -18,17 +18,17 @@ static struct vm vm;
>  
>  static void test_diag_500(void)
>  {
> -	extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_500)[];
> -	extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_500)[];
> -	extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_500)[];
> -	extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_500)[];
> -	int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_500);
> -	int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_500);
> +	extern const char SNIPPET_NAME_START(asm, pv_diag_500)[];
> +	extern const char SNIPPET_NAME_END(asm, pv_diag_500)[];
> +	extern const char SNIPPET_HDR_START(asm, pv_diag_500)[];
> +	extern const char SNIPPET_HDR_END(asm, pv_diag_500)[];
> +	int size_hdr = SNIPPET_HDR_LEN(asm, pv_diag_500);
> +	int size_gbin = SNIPPET_LEN(asm, pv_diag_500);
>  
>  	report_prefix_push("diag 0x500");
>  
> -	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_500),
> -			SNIPPET_HDR_START(asm, snippet_pv_diag_500),
> +	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, pv_diag_500),
> +			SNIPPET_HDR_START(asm, pv_diag_500),
>  			size_gbin, size_hdr, SNIPPET_UNPACK_OFF);
>  
>  	sie(&vm);
> @@ -70,17 +70,17 @@ static void test_diag_500(void)
>  
>  static void test_diag_288(void)
>  {
> -	extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_288)[];
> -	extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_288)[];
> -	extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_288)[];
> -	extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_288)[];
> -	int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_288);
> -	int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_288);
> +	extern const char SNIPPET_NAME_START(asm, pv_diag_288)[];
> +	extern const char SNIPPET_NAME_END(asm, pv_diag_288)[];
> +	extern const char SNIPPET_HDR_START(asm, pv_diag_288)[];
> +	extern const char SNIPPET_HDR_END(asm, pv_diag_288)[];
> +	int size_hdr = SNIPPET_HDR_LEN(asm, pv_diag_288);
> +	int size_gbin = SNIPPET_LEN(asm, pv_diag_288);
>  
>  	report_prefix_push("diag 0x288");
>  
> -	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_288),
> -			SNIPPET_HDR_START(asm, snippet_pv_diag_288),
> +	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, pv_diag_288),
> +			SNIPPET_HDR_START(asm, pv_diag_288),
>  			size_gbin, size_hdr, SNIPPET_UNPACK_OFF);
>  
>  	sie(&vm);
> @@ -111,17 +111,17 @@ static void test_diag_288(void)
>  
>  static void test_diag_yield(void)
>  {
> -	extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_yield)[];
> -	extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_yield)[];
> -	extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_yield)[];
> -	extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_yield)[];
> -	int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_yield);
> -	int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_yield);
> +	extern const char SNIPPET_NAME_START(asm, pv_diag_yield)[];
> +	extern const char SNIPPET_NAME_END(asm, pv_diag_yield)[];
> +	extern const char SNIPPET_HDR_START(asm, pv_diag_yield)[];
> +	extern const char SNIPPET_HDR_END(asm, pv_diag_yield)[];
> +	int size_hdr = SNIPPET_HDR_LEN(asm, pv_diag_yield);
> +	int size_gbin = SNIPPET_LEN(asm, pv_diag_yield);
>  
>  	report_prefix_push("diag yield");
>  
> -	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_yield),
> -			SNIPPET_HDR_START(asm, snippet_pv_diag_yield),
> +	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, pv_diag_yield),
> +			SNIPPET_HDR_START(asm, pv_diag_yield),
>  			size_gbin, size_hdr, SNIPPET_UNPACK_OFF);
>  
>  	/* 0x44 */
> diff --git a/s390x/snippets/asm/snippet-pv-diag-288.S b/s390x/snippets/asm/pv-diag-288.S
> similarity index 100%
> rename from s390x/snippets/asm/snippet-pv-diag-288.S
> rename to s390x/snippets/asm/pv-diag-288.S
> diff --git a/s390x/snippets/asm/snippet-pv-diag-500.S b/s390x/snippets/asm/pv-diag-500.S
> similarity index 100%
> rename from s390x/snippets/asm/snippet-pv-diag-500.S
> rename to s390x/snippets/asm/pv-diag-500.S
> diff --git a/s390x/snippets/asm/snippet-pv-diag-yield.S b/s390x/snippets/asm/pv-diag-yield.S
> similarity index 100%
> rename from s390x/snippets/asm/snippet-pv-diag-yield.S
> rename to s390x/snippets/asm/pv-diag-yield.S
Nico Boehr April 26, 2023, 11:24 a.m. UTC | #2 
Quoting Janosch Frank (2023-04-21 13:36:43)
> It's a bit redundant.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

Yes, this has confused me before!

Acked-by: Nico Boehr <nrb@linux.ibm.com>
diff mbox series

Patch

diff --git a/s390x/Makefile b/s390x/Makefile
index a80db538..8d1cfc7c 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -122,9 +122,9 @@  snippet_lib = $(snippet_asmlib) lib/auxinfo.o
 $(TEST_DIR)/mvpg-sie.elf: snippets = $(SNIPPET_DIR)/c/mvpg-snippet.gbin
 $(TEST_DIR)/spec_ex-sie.elf: snippets = $(SNIPPET_DIR)/c/spec_ex.gbin
 
-$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-yield.gbin
-$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-288.gbin
-$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-500.gbin
+$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-yield.gbin
+$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-288.gbin
+$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-500.gbin
 
 ifneq ($(GEN_SE_HEADER),)
 snippets += $(pv-snippets)
diff --git a/s390x/pv-diags.c b/s390x/pv-diags.c
index 096ac61f..fa4e5532 100644
--- a/s390x/pv-diags.c
+++ b/s390x/pv-diags.c
@@ -18,17 +18,17 @@  static struct vm vm;
 
 static void test_diag_500(void)
 {
-	extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_500)[];
-	extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_500)[];
-	extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_500)[];
-	extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_500)[];
-	int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_500);
-	int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_500);
+	extern const char SNIPPET_NAME_START(asm, pv_diag_500)[];
+	extern const char SNIPPET_NAME_END(asm, pv_diag_500)[];
+	extern const char SNIPPET_HDR_START(asm, pv_diag_500)[];
+	extern const char SNIPPET_HDR_END(asm, pv_diag_500)[];
+	int size_hdr = SNIPPET_HDR_LEN(asm, pv_diag_500);
+	int size_gbin = SNIPPET_LEN(asm, pv_diag_500);
 
 	report_prefix_push("diag 0x500");
 
-	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_500),
-			SNIPPET_HDR_START(asm, snippet_pv_diag_500),
+	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, pv_diag_500),
+			SNIPPET_HDR_START(asm, pv_diag_500),
 			size_gbin, size_hdr, SNIPPET_UNPACK_OFF);
 
 	sie(&vm);
@@ -70,17 +70,17 @@  static void test_diag_500(void)
 
 static void test_diag_288(void)
 {
-	extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_288)[];
-	extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_288)[];
-	extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_288)[];
-	extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_288)[];
-	int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_288);
-	int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_288);
+	extern const char SNIPPET_NAME_START(asm, pv_diag_288)[];
+	extern const char SNIPPET_NAME_END(asm, pv_diag_288)[];
+	extern const char SNIPPET_HDR_START(asm, pv_diag_288)[];
+	extern const char SNIPPET_HDR_END(asm, pv_diag_288)[];
+	int size_hdr = SNIPPET_HDR_LEN(asm, pv_diag_288);
+	int size_gbin = SNIPPET_LEN(asm, pv_diag_288);
 
 	report_prefix_push("diag 0x288");
 
-	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_288),
-			SNIPPET_HDR_START(asm, snippet_pv_diag_288),
+	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, pv_diag_288),
+			SNIPPET_HDR_START(asm, pv_diag_288),
 			size_gbin, size_hdr, SNIPPET_UNPACK_OFF);
 
 	sie(&vm);
@@ -111,17 +111,17 @@  static void test_diag_288(void)
 
 static void test_diag_yield(void)
 {
-	extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_yield)[];
-	extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_yield)[];
-	extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_yield)[];
-	extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_yield)[];
-	int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_yield);
-	int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_yield);
+	extern const char SNIPPET_NAME_START(asm, pv_diag_yield)[];
+	extern const char SNIPPET_NAME_END(asm, pv_diag_yield)[];
+	extern const char SNIPPET_HDR_START(asm, pv_diag_yield)[];
+	extern const char SNIPPET_HDR_END(asm, pv_diag_yield)[];
+	int size_hdr = SNIPPET_HDR_LEN(asm, pv_diag_yield);
+	int size_gbin = SNIPPET_LEN(asm, pv_diag_yield);
 
 	report_prefix_push("diag yield");
 
-	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_yield),
-			SNIPPET_HDR_START(asm, snippet_pv_diag_yield),
+	snippet_pv_init(&vm, SNIPPET_NAME_START(asm, pv_diag_yield),
+			SNIPPET_HDR_START(asm, pv_diag_yield),
 			size_gbin, size_hdr, SNIPPET_UNPACK_OFF);
 
 	/* 0x44 */
diff --git a/s390x/snippets/asm/snippet-pv-diag-288.S b/s390x/snippets/asm/pv-diag-288.S
similarity index 100%
rename from s390x/snippets/asm/snippet-pv-diag-288.S
rename to s390x/snippets/asm/pv-diag-288.S
diff --git a/s390x/snippets/asm/snippet-pv-diag-500.S b/s390x/snippets/asm/pv-diag-500.S
similarity index 100%
rename from s390x/snippets/asm/snippet-pv-diag-500.S
rename to s390x/snippets/asm/pv-diag-500.S
diff --git a/s390x/snippets/asm/snippet-pv-diag-yield.S b/s390x/snippets/asm/pv-diag-yield.S
similarity index 100%
rename from s390x/snippets/asm/snippet-pv-diag-yield.S
rename to s390x/snippets/asm/pv-diag-yield.S