Demi Marie Obenour <demiobenour@gmail.com> writes:
No other functional change intended.
Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com> --- scripts/run-qemu.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
If we're doing formatting changes like this it's definitely time to adopt a shell script formatter, so I'm going to apply my previous series for that[1]. If you can find a shell formatter that does matched parentheses for case statements, we can switch. :) [1]: https://spectrum-os.org/lists/archives/spectrum-devel/20251001102838.7086-1-...
diff --git a/scripts/run-qemu.sh b/scripts/run-qemu.sh index 64fd29259ab108bc547cb7c74623ae9dc288b3b7..9c6c8193bbeba5916038c82d8f76992051719c19 100755 --- a/scripts/run-qemu.sh +++ b/scripts/run-qemu.sh @@ -1,11 +1,15 @@ -#!/bin/sh -ue +#!/bin/sh -- # SPDX-FileCopyrightText: 2023-2025 Alyssa Ross <hi@alyssa.is> # SPDX-License-Identifier: EUPL-1.2+
# This script wraps around QEMU to paper over platform differences, # which can't be handled portably in Make language. +set -uef +if [ -n ${ARCH+test} ]; then + ARCH=$(uname -m) +fi
-case "${ARCH:="$(uname -m)"}" in +case $ARCH in aarch64) machine=virt,accel=kvm:tcg,gic-version=3,iommu=smmuv3 ;; @@ -17,13 +21,13 @@ case "${ARCH:="$(uname -m)"}" in esac
i=0 -while [ $i -lt $# ]; do - arg="$1" +while [ "$i" -lt "$#" ]; do + arg=$1 shift
- case "$arg" in + case $arg in -append) - set -- "$@" -append "${append:+$append }$1" + set -- "$@" -append ${append:+"$append "}"$1" i=$((i + 2)) shift continue @@ -31,10 +35,10 @@ while [ $i -lt $# ]; do -device) IFS=, for opt in $1; do - case "$opt" in - *-iommu) - unset iommu - ;; + case $opt in + *-iommu) + unset iommu + ;; esac break done
-- 2.51.2