From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
thuth@redhat.com, nrb@linux.ibm.com, david@redhat.com
Subject: [kvm-unit-tests PATCH v4 3/7] s390x: pv-diags: Drop snippet from snippet names
Date: Tue, 2 May 2023 11:59:27 +0000 [thread overview]
Message-ID: <20230502115931.86280-4-frankja@linux.ibm.com> (raw)
In-Reply-To: <20230502115931.86280-1-frankja@linux.ibm.com>
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
--
2.34.1
next prev parent reply other threads:[~2023-05-02 12:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 11:59 [kvm-unit-tests PATCH v4 0/7] s390x: Add PV SIE intercepts and ipl tests Janosch Frank
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 1/7] lib: s390x: uv: Introduce UV validity function Janosch Frank
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 2/7] lib: s390x: uv: Add intercept data check library function Janosch Frank
2023-05-02 11:59 ` Janosch Frank [this message]
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 4/7] lib: s390x: uv: Add pv host requirement check function Janosch Frank
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 5/7] s390x: pv: Add sie entry intercept and validity test Janosch Frank
2023-05-10 7:28 ` Nico Boehr
2023-05-15 11:53 ` [kvm-unit-tests PATCH v5] " Janosch Frank
2023-05-15 14:00 ` Nico Boehr
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 6/7] s390x: pv: Add IPL reset tests Janosch Frank
2023-05-10 7:32 ` Nico Boehr
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 7/7] s390x: pv-diags: Add the test to unittests.conf Janosch Frank
2023-05-10 7:33 ` Nico Boehr
2023-05-31 10:58 ` [kvm-unit-tests PATCH v4 0/7] s390x: Add PV SIE intercepts and ipl tests Nico Boehr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230502115931.86280-4-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=david@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=nrb@linux.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox