From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-s390x@nongnu.org
Cc: frankja@linux.ibm.com, thuth@redhat.com
Subject: [PATCH v2 2/2] s390x: intercept: make sure all output lines are unique
Date: Thu, 21 Jul 2022 15:30:02 +0200 [thread overview]
Message-ID: <20220721133002.142897-3-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20220721133002.142897-1-imbrenda@linux.ibm.com>
The intercept test has the same output line twice for two different
testcases.
Fix this by adding report_prefix_push() as appropriate.
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
s390x/intercept.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/s390x/intercept.c b/s390x/intercept.c
index 656b8adb..9e826b6c 100644
--- a/s390x/intercept.c
+++ b/s390x/intercept.c
@@ -68,14 +68,19 @@ static void test_spx(void)
set_prefix(old_prefix);
report(pagebuf[GEN_LC_STFL] != 0, "stfl to new prefix");
+ report_prefix_push("operand not word aligned");
expect_pgm_int();
asm volatile(" spx 0(%0) " : : "r"(1));
check_pgm_int_code(PGM_INT_CODE_SPECIFICATION);
+ report_prefix_pop();
+ report_prefix_push("operand outside memory");
expect_pgm_int();
asm volatile(" spx 0(%0) " : : "r"(-8L));
check_pgm_int_code(PGM_INT_CODE_ADDRESSING);
+ report_prefix_pop();
+ report_prefix_push("new prefix outside memory");
new_prefix = get_ram_size() & 0x7fffe000;
/* TODO: Remove host_is_tcg() checks once CIs are using QEMU >= 7.1 */
if (!host_is_tcg() && (get_ram_size() - new_prefix < 2 * PAGE_SIZE)) {
@@ -95,6 +100,7 @@ static void test_spx(void)
else
report_skip("inaccessible prefix area");
}
+ report_prefix_pop();
}
/* Test the STORE CPU ADDRESS instruction */
--
2.36.1
next prev parent reply other threads:[~2022-07-21 13:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 13:30 [PATCH v2 0/2] s390x: Pipeline and other minor fixes Claudio Imbrenda
2022-07-21 13:30 ` [PATCH v2 1/2] s390x: intercept: fence one test when using TCG Claudio Imbrenda
2022-07-21 13:41 ` Thomas Huth
2022-07-21 13:46 ` Claudio Imbrenda
2022-07-21 13:30 ` Claudio Imbrenda [this message]
2022-07-21 13:42 ` [PATCH v2 2/2] s390x: intercept: make sure all output lines are unique Thomas Huth
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=20220721133002.142897-3-imbrenda@linux.ibm.com \
--to=imbrenda@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=qemu-s390x@nongnu.org \
--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