From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BB23C77B73 for ; Tue, 2 May 2023 12:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234178AbjEBMVU (ORCPT ); Tue, 2 May 2023 08:21:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233749AbjEBMVS (ORCPT ); Tue, 2 May 2023 08:21:18 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A30C51A1; Tue, 2 May 2023 05:21:17 -0700 (PDT) Received: from pps.filterd (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 342C8Sjh010797; Tue, 2 May 2023 12:21:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=/BRh1u6/GaF8L8ezrQU6sTdUbX4gJzT5JnjDSjNP+kI=; b=fRXVA30e7EXLaMOugdh6O/hx5TVBEbVAQESI54fyiym+Mx7EEtvZ2c/SamI1ZIgoUgWC /hBCevMqVRi4lLvPC8hBxcdPn+BGnarlhZ5f9D9zycYzjM6P8z6jTpp+rTAq+bI2l/Wq UE2Z7f+SOlOTv967uHeCY/V1kbnhIkbx7zSkcztYiJKN3YIOy4uyQnpsZ4rHJuUEXC/8 9mUAPGANxvriBLCgHHbD7Mt2tk6KTdpQqm53cYAwm0WD3q0gTOoeVKBmGg9xrD6Ev5Z9 GT7itZayUoNvH/fKV9Racqwf0VWcvsCU3Zk5j0AqSB7kXVzBi7dLU6znCckf4Jz96ZSq SA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qb22jgv12-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 02 May 2023 12:21:17 +0000 Received: from m0353728.ppops.net (m0353728.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 342C9EtZ014631; Tue, 2 May 2023 12:21:16 GMT Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qb22jguyn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 02 May 2023 12:21:16 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3423uU3T032223; Tue, 2 May 2023 12:00:49 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3q8tgfs9w8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 02 May 2023 12:00:48 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 342C0j5q3670584 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 2 May 2023 12:00:45 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4E19220043; Tue, 2 May 2023 12:00:45 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F8BA2004B; Tue, 2 May 2023 12:00:44 +0000 (GMT) Received: from linux6.. (unknown [9.114.12.104]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 2 May 2023 12:00:44 +0000 (GMT) From: Janosch Frank 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 Message-Id: <20230502115931.86280-4-frankja@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502115931.86280-1-frankja@linux.ibm.com> References: <20230502115931.86280-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: lylmSEywnXiIDP9Yty8DUM534H-1hqtA X-Proofpoint-ORIG-GUID: rKVKGfq3X1gJ4Jk6Fq5tszFmeU6f5qOb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-02_05,2023-04-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 spamscore=0 mlxscore=0 suspectscore=0 adultscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305020103 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org It's a bit redundant. Signed-off-by: Janosch Frank Reviewed-by: Claudio Imbrenda --- 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