From: Nico Boehr <nrb@linux.ibm.com>
To: thuth@redhat.com, pbonzini@redhat.com, andrew.jones@linux.dev
Cc: kvm@vger.kernel.org, frankja@linux.ibm.com,
imbrenda@linux.ibm.com, Nicholas Piggin <npiggin@gmail.com>
Subject: [kvm-unit-tests GIT PULL 10/13] s390x: Fix is_pv check in run script
Date: Wed, 24 Apr 2024 12:59:29 +0200 [thread overview]
Message-ID: <20240424105935.184138-11-nrb@linux.ibm.com> (raw)
In-Reply-To: <20240424105935.184138-1-nrb@linux.ibm.com>
From: Nicholas Piggin <npiggin@gmail.com>
Shellcheck reports "is_pv references arguments, but none are ever
passed." and suggests "use is_pv "$@" if function's $1 should mean
script's $1."
The is_pv test does not evaluate to true for .pv.bin file names, only
for _PV suffix test names. The arch_cmd_s390x() function appends
.pv.bin to the file name AND _PV to the test name, so this does not
affect run_tests.sh runs, but it might prevent PV tests from being
run directly with the s390x-run command.
Reported-by: shellcheck SC2119, SC2120
Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
---
s390x/run | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/s390x/run b/s390x/run
index e58fa4af..34552c27 100755
--- a/s390x/run
+++ b/s390x/run
@@ -21,12 +21,12 @@ is_pv() {
return 1
}
-if is_pv && [ "$ACCEL" = "tcg" ]; then
+if is_pv "$@" && [ "$ACCEL" = "tcg" ]; then
echo "Protected Virtualization isn't supported under TCG"
exit 2
fi
-if is_pv && [ "$MIGRATION" = "yes" ]; then
+if is_pv "$@" && [ "$MIGRATION" = "yes" ]; then
echo "Migration isn't supported under Protected Virtualization"
exit 2
fi
@@ -34,12 +34,12 @@ fi
M='-machine s390-ccw-virtio'
M+=",accel=$ACCEL$ACCEL_PROPS"
-if is_pv; then
+if is_pv "$@"; then
M+=",confidential-guest-support=pv0"
fi
command="$qemu -nodefaults -nographic $M"
-if is_pv; then
+if is_pv "$@"; then
command+=" -object s390-pv-guest,id=pv0"
fi
command+=" -chardev stdio,id=con0 -device sclpconsole,chardev=con0"
--
2.44.0
next prev parent reply other threads:[~2024-04-24 10:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 10:59 [kvm-unit-tests GIT PULL 00/13] s390x: Improvement of CMM test, lot of small bugfixes and two refactorings Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 01/13] s390x/Makefile: simplify Secure Execution boot image generation Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 02/13] lib: s390x: sigp: Dirty CC before sigp execution Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 03/13] lib: s390x: uv: Dirty CC before uvc execution Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 04/13] lib: s390x: css: Dirty CC before css instructions Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 05/13] s390x: mvpg: Dirty CC before mvpg execution Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 06/13] s390x: sclp: Dirty CC before sclp execution Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 07/13] lib: s390x: sigp: Name inline assembly arguments Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 08/13] s390x: add pv-attest to unittests.cfg Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 09/13] s390x: emulator: Fix error path of invalid function code Nico Boehr
2024-04-24 10:59 ` Nico Boehr [this message]
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 11/13] s390x: Use local accel variable in arch_cmd_s390x Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 12/13] lib: s390: fix guest length in uv_create_guest() Nico Boehr
2024-04-24 10:59 ` [kvm-unit-tests GIT PULL 13/13] s390x: cmm: test no-translate bit after reset Nico Boehr
2024-04-24 11:32 ` [kvm-unit-tests GIT PULL 00/13] s390x: Improvement of CMM test, lot of small bugfixes and two refactorings 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=20240424105935.184138-11-nrb@linux.ibm.com \
--to=nrb@linux.ibm.com \
--cc=andrew.jones@linux.dev \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=npiggin@gmail.com \
--cc=pbonzini@redhat.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).