public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH] doc/demo: Fix and suppress ShellCheck warnings
Date: Mon, 27 Feb 2023 11:00:14 +0100	[thread overview]
Message-ID: <20230227100014.225870-1-sbrivio@redhat.com> (raw)

ShellCheck reports (SC2034) that __qemu_arch is not used. Use it,
and silence the resulting SC2086 warning as we want word splitting on
options we pass with it.

While at it, silence SC2317 warnings for commands in cleanup() that
appear to be unreachable: cleanup() is only called as trap.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 doc/demo.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/demo.sh b/doc/demo.sh
index ed71ffb..5b05ddf 100755
--- a/doc/demo.sh
+++ b/doc/demo.sh
@@ -110,6 +110,7 @@ next() {
 }
 
 # cleanup() - Terminate pasta and passt, clean up, restore TTY settings
+# shellcheck disable=SC2317
 cleanup() {
 	[ -f "${DEMO_DIR}/pasta.pid" ] && kill "$(cat "${DEMO_DIR}/pasta.pid")"
 	[ -f "${DEMO_DIR}/passt.pid" ] && kill "$(cat "${DEMO_DIR}/passt.pid")"
@@ -223,7 +224,8 @@ into_ns() {
 	echo "Use ^C to terminate it."
 	next
 
-	cmd qrap 5 qemu-system-x86_64 -M pc,accel=kvm:tcg		    \
+	# shellcheck disable=SC2086
+	cmd qrap 5 ${__qemu_arch}					    \
 		-smp "$(nproc)" -m 1024					    \
 		-nographic -serial stdio -nodefaults -no-reboot -vga none   \
 		-initrd "${DEMO_DIR}/demo.img"				    \
-- 
@@ -110,6 +110,7 @@ next() {
 }
 
 # cleanup() - Terminate pasta and passt, clean up, restore TTY settings
+# shellcheck disable=SC2317
 cleanup() {
 	[ -f "${DEMO_DIR}/pasta.pid" ] && kill "$(cat "${DEMO_DIR}/pasta.pid")"
 	[ -f "${DEMO_DIR}/passt.pid" ] && kill "$(cat "${DEMO_DIR}/passt.pid")"
@@ -223,7 +224,8 @@ into_ns() {
 	echo "Use ^C to terminate it."
 	next
 
-	cmd qrap 5 qemu-system-x86_64 -M pc,accel=kvm:tcg		    \
+	# shellcheck disable=SC2086
+	cmd qrap 5 ${__qemu_arch}					    \
 		-smp "$(nproc)" -m 1024					    \
 		-nographic -serial stdio -nodefaults -no-reboot -vga none   \
 		-initrd "${DEMO_DIR}/demo.img"				    \
-- 
2.39.1


             reply	other threads:[~2023-02-27 10:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-27 10:00 Stefano Brivio [this message]
2023-02-27 10:54 ` [PATCH] doc/demo: Fix and suppress ShellCheck warnings David Gibson

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=20230227100014.225870-1-sbrivio@redhat.com \
    --to=sbrivio@redhat.com \
    --cc=passt-dev@passt.top \
    /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.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

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 IMAP folder(s).