From patchwork Tue Feb 19 08:49:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 10819477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 253021399 for ; Tue, 19 Feb 2019 08:49:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11C352B331 for ; Tue, 19 Feb 2019 08:49:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0601D2B362; Tue, 19 Feb 2019 08:49:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 962C22B343 for ; Tue, 19 Feb 2019 08:49:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727602AbfBSItg (ORCPT ); Tue, 19 Feb 2019 03:49:36 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43498 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725765AbfBSItg (ORCPT ); Tue, 19 Feb 2019 03:49:36 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1J8iV4T021911 for ; Tue, 19 Feb 2019 03:49:35 -0500 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qrd1qwjjy-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Feb 2019 03:49:34 -0500 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Feb 2019 08:49:32 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 19 Feb 2019 08:49:28 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1J8nRnb11665518 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Feb 2019 08:49:28 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A937952052; Tue, 19 Feb 2019 08:49:27 +0000 (GMT) Received: from s38lp20.lnxne.boe (unknown [9.152.224.63]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7670752051; Tue, 19 Feb 2019 08:49:27 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.co Subject: [kvm-unit-tests PATCH 1/3] s390x: Beautify sthyi report strings Date: Tue, 19 Feb 2019 09:49:11 +0100 X-Mailer: git-send-email 2.14.3 In-Reply-To: <20190219084913.198737-1-frankja@linux.ibm.com> References: <20190219084913.198737-1-frankja@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19021908-0008-0000-0000-000002C229CC X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19021908-0009-0000-0000-0000222E5AF8 Message-Id: <20190219084913.198737-2-frankja@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-19_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=700 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902190067 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Tests like the register odd check in r1 and r2 were not destinguishable and the reports were hard to read in total. Signed-off-by: Janosch Frank --- s390x/sthyi.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/s390x/sthyi.c b/s390x/sthyi.c index 16b8c14..aaf13af 100644 --- a/s390x/sthyi.c +++ b/s390x/sthyi.c @@ -52,10 +52,12 @@ static void test_exception_addr(void) static void test_exception_reg_odd(void) { - report_prefix_push("Register check odd"); + report_prefix_push("Register check odd R1"); expect_pgm_int(); sthyi((uint64_t)pagebuf, 0, NULL, 1, 2); check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); + report_prefix_pop(); + report_prefix_push("Register check odd R2"); expect_pgm_int(); sthyi((uint64_t)pagebuf, 0, NULL, 0, 3); check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); @@ -76,52 +78,59 @@ static void test_function_code(uint64_t addr) uint64_t urc = 0; int cc = sthyi((uint64_t)pagebuf, 42, &urc, 0, 2); - report("Ill. fcode", cc == 3 && urc == CODE_UNSUPP); + report("Illegal fcode", cc == 3 && urc == CODE_UNSUPP); } static void test_fcode0_hdr(struct sthyi_hdr_sctn *hdr) { - report("HDR length", (hdr->INFHDLN >= sizeof(*hdr) + report_prefix_push("Header"); + + report("length", (hdr->INFHDLN >= sizeof(*hdr) && !(hdr->INFHDLN % 8))); - report("MACH sctn length", (hdr->INFMLEN >= sizeof(struct sthyi_mach_sctn) + report("Machine sctn length", (hdr->INFMLEN >= sizeof(struct sthyi_mach_sctn) && !(hdr->INFMLEN % 8))); - report("PAR sctn length", (hdr->INFPLEN >= sizeof(struct sthyi_par_sctn) + report("Partition section length", (hdr->INFPLEN >= sizeof(struct sthyi_par_sctn) && !(hdr->INFPLEN % 8))); - report("MACH offset", hdr->INFMOFF >= hdr->INFHDLN); - report("PAR offset", hdr->INFPOFF >= hdr->INFHDLN); + report("Machine offset", hdr->INFMOFF >= hdr->INFHDLN); + report("Partition offset", hdr->INFPOFF >= hdr->INFHDLN); + report_prefix_pop(); } static void test_fcode0_mach(struct sthyi_mach_sctn *mach) { int sum = mach->INFMSCPS + mach->INFMDCPS + mach->INFMSIFL + mach->INFMDIFL; + report_prefix_push("Machine"); if (mach->INFMVAL1 & MACH_ID_VLD) { - report("MACH type", memcmp(mach->INFMTYPE, null_buf, sizeof(mach->INFMTYPE))); - report("MACH manu", memcmp(mach->INFMMANU, null_buf, sizeof(mach->INFMMANU))); - report("MACH seq", memcmp(mach->INFMSEQ, null_buf, sizeof(mach->INFMSEQ))); - report("MACH plant", memcmp(mach->INFMPMAN, null_buf, sizeof(mach->INFMPMAN))); + report("type", memcmp(mach->INFMTYPE, null_buf, sizeof(mach->INFMTYPE))); + report("manufacturer", memcmp(mach->INFMMANU, null_buf, sizeof(mach->INFMMANU))); + report("sequence", memcmp(mach->INFMSEQ, null_buf, sizeof(mach->INFMSEQ))); + report("plant", memcmp(mach->INFMPMAN, null_buf, sizeof(mach->INFMPMAN))); } if (mach->INFMVAL1 & MACH_NAME_VLD) - report("MACH name", memcmp(mach->INFMNAME, null_buf, + report("name", memcmp(mach->INFMNAME, null_buf, sizeof(mach->INFMNAME))); if (mach->INFMVAL1 & MACH_CNT_VLD) - report("MACH core counts", sum); + report("core counts", sum); + report_prefix_pop(); } static void test_fcode0_par(struct sthyi_par_sctn *par) { int sum = par->INFPSCPS + par->INFPDCPS + par->INFPSIFL + par->INFPDIFL; + report_prefix_push("Partition"); if (par->INFPVAL1 & PART_CNT_VLD) - report("PAR core counts", sum); + report("core counts", sum); if (par->INFPVAL1 & PART_STSI_SUC) { - report("PAR number", par->INFPPNUM); - report("PAR name", memcmp(par->INFPPNAM, null_buf, sizeof(par->INFPPNAM))); + report("number", par->INFPPNUM); + report("name", memcmp(par->INFPPNAM, null_buf, sizeof(par->INFPPNAM))); } + report_prefix_pop(); } static void test_fcode0(void) @@ -133,6 +142,7 @@ static void test_fcode0(void) /* Zero destination memory. */ memset(pagebuf, 0, PAGE_SIZE); + report_prefix_push("fcode 0"); sthyi((uint64_t)pagebuf, 0, NULL, 0, 2); hdr = (void *)pagebuf; mach = (void *)pagebuf + hdr->INFMOFF; @@ -141,6 +151,7 @@ static void test_fcode0(void) test_fcode0_hdr(hdr); test_fcode0_mach(mach); test_fcode0_par(par); + report_prefix_pop(); } int main(void) @@ -156,10 +167,12 @@ int main(void) } /* Test register/argument checking. */ + report_prefix_push("Instruction"); test_exception_addr(); test_exception_reg_odd(); test_exception_reg_equal(); test_function_code((uint64_t) pagebuf); + report_prefix_pop(); /* Test function code 0 - CP and IFL Capacity Information */ test_fcode0(); From patchwork Tue Feb 19 08:49:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 10819479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A38613B5 for ; Tue, 19 Feb 2019 08:49:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8562C2B331 for ; Tue, 19 Feb 2019 08:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 767632B3E2; Tue, 19 Feb 2019 08:49:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 371E72B331 for ; Tue, 19 Feb 2019 08:49:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727538AbfBSItg (ORCPT ); Tue, 19 Feb 2019 03:49:36 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37196 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727244AbfBSItf (ORCPT ); Tue, 19 Feb 2019 03:49:35 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1J8i8aR040512 for ; Tue, 19 Feb 2019 03:49:34 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qrcvmpg8j-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Feb 2019 03:49:34 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Feb 2019 08:49:31 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 19 Feb 2019 08:49:30 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1J8nTRL27525166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Feb 2019 08:49:29 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B4B652050; Tue, 19 Feb 2019 08:49:29 +0000 (GMT) Received: from s38lp20.lnxne.boe (unknown [9.152.224.63]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id C1B595204E; Tue, 19 Feb 2019 08:49:28 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.co Subject: [kvm-unit-tests PATCH 2/3] s390x: Beautify pfmf report strings Date: Tue, 19 Feb 2019 09:49:12 +0100 X-Mailer: git-send-email 2.14.3 In-Reply-To: <20190219084913.198737-1-frankja@linux.ibm.com> References: <20190219084913.198737-1-frankja@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19021908-0028-0000-0000-0000034A425F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19021908-0029-0000-0000-000024087D0B Message-Id: <20190219084913.198737-3-frankja@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-19_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=843 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902190067 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use a 4k/1m prefix rather than mangling it into the report string. Signed-off-by: Janosch Frank --- s390x/pfmf.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/s390x/pfmf.c b/s390x/pfmf.c index 4cc6bd1..340b0bd 100644 --- a/s390x/pfmf.c +++ b/s390x/pfmf.c @@ -64,6 +64,7 @@ static void test_4k_key(void) union r1 r1; union skey skey; + report_prefix_push("4K"); r1.val = 0; r1.reg.sk = 1; r1.reg.fsc = FSC_4K; @@ -71,7 +72,8 @@ static void test_4k_key(void) pfmf(r1.val, (unsigned long) pagebuf); skey.val = get_storage_key((unsigned long) pagebuf); skey.val &= SKEY_ACC | SKEY_FP; - report("set 4k", skey.val == 0x30); + report("set storage keys", skey.val == 0x30); + report_prefix_pop(); } static void test_1m_key(void) @@ -80,6 +82,7 @@ static void test_1m_key(void) union r1 r1; union skey skey; + report_prefix_push("1M"); r1.val = 0; r1.reg.sk = 1; r1.reg.fsc = FSC_1M; @@ -89,11 +92,12 @@ static void test_1m_key(void) skey.val = get_storage_key((unsigned long) pagebuf + i * PAGE_SIZE); skey.val &= SKEY_ACC | SKEY_FP; if (skey.val != 0x30) { - report("set 1M", false); + report("set storage keys", false); return; } } - report("set 1M", true); + report("set storage keys", true); + report_prefix_pop(); } static void test_4k_clear(void) @@ -104,9 +108,11 @@ static void test_4k_clear(void) r1.reg.cf = 1; r1.reg.fsc = FSC_4K; + report_prefix_push("4K"); memset(pagebuf, 42, PAGE_SIZE); pfmf(r1.val, (unsigned long) pagebuf); - report("clear 4k", !memcmp(pagebuf, pagebuf + PAGE_SIZE, PAGE_SIZE)); + report("clear memory", !memcmp(pagebuf, pagebuf + PAGE_SIZE, PAGE_SIZE)); + report_prefix_pop(); } static void test_1m_clear(void) @@ -119,11 +125,13 @@ static void test_1m_clear(void) r1.reg.cf = 1; r1.reg.fsc = FSC_1M; + report_prefix_push("1M"); memset(pagebuf, 42, PAGE_SIZE * 256); pfmf(r1.val, (unsigned long) pagebuf); for (i = 0; i < PAGE_SIZE * 256; i++) sum |= pagebuf[i]; report("clear 1m", !sum); + report_prefix_pop(); } int main(void) @@ -141,8 +149,8 @@ int main(void) memset(pagebuf, 0, PAGE_SIZE * 256); test_4k_key(); - test_1m_key(); test_4k_clear(); + test_1m_key(); test_1m_clear(); done: From patchwork Tue Feb 19 08:49:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 10819481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73BC213B5 for ; Tue, 19 Feb 2019 08:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62E002B331 for ; Tue, 19 Feb 2019 08:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 577B92B362; Tue, 19 Feb 2019 08:49:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BC732B331 for ; Tue, 19 Feb 2019 08:49:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727654AbfBSIti (ORCPT ); Tue, 19 Feb 2019 03:49:38 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37576 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727638AbfBSIti (ORCPT ); Tue, 19 Feb 2019 03:49:38 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1J8i7Pf040418 for ; Tue, 19 Feb 2019 03:49:37 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qrcvmpgaj-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Feb 2019 03:49:36 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Feb 2019 08:49:33 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 19 Feb 2019 08:49:31 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1J8nUsc49020932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Feb 2019 08:49:30 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5644852051; Tue, 19 Feb 2019 08:49:30 +0000 (GMT) Received: from s38lp20.lnxne.boe (unknown [9.152.224.63]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1A8CA5204F; Tue, 19 Feb 2019 08:49:30 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.co Subject: [kvm-unit-tests PATCH 3/3] s390x: Add prefix for dxc afp emulator test Date: Tue, 19 Feb 2019 09:49:13 +0100 X-Mailer: git-send-email 2.14.3 In-Reply-To: <20190219084913.198737-1-frankja@linux.ibm.com> References: <20190219084913.198737-1-frankja@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19021908-0020-0000-0000-000003187EDC X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19021908-0021-0000-0000-00002169C2D3 Message-Id: <20190219084913.198737-4-frankja@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-19_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=902 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902190067 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Without it we have two reports that look the same, but don't have the same control register state for the test. Signed-off-by: Janosch Frank Reviewed-by: Thomas Huth --- s390x/emulator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/s390x/emulator.c b/s390x/emulator.c index f49c414..4c26b80 100644 --- a/s390x/emulator.c +++ b/s390x/emulator.c @@ -266,6 +266,7 @@ static void test_dxc(void) lc->dxc_vxc = 0x12345678; set_fpc_dxc(0); + report_prefix_push("afp"); expect_pgm_int(); asm volatile(" .insn rrf,0xb9600000,%0,%0,8,0\n" : : "r"(0) : "memory"); @@ -273,7 +274,7 @@ static void test_dxc(void) report("dxc in LC", lc->dxc_vxc == 0xff); report("dxc in FPC", get_fpc_dxc() == 0xff); - + report_prefix_pop(); /* DXC (0xff) is to be stored in LC only on a trap (CRT) without AFP */ lc->dxc_vxc = 0x12345678;