From: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
To: qemu-devel@nongnu.org
Cc: riku.voipio@iki.fi, laurent@vivier.eu
Subject: [PATCH v10 01/10] qemu-binfmt-conf.sh: enforce style consistency
Date: Mon, 9 Mar 2020 19:18:46 +0000 [thread overview]
Message-ID: <20200309191846.GA65@669c1c222ef4> (raw)
In-Reply-To: <20200309191200.GA60@669c1c222ef4>
Spaces are removed before '; then', for consistency with other scripts
in the project.
Signed-off-by: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 9f1580a91c..c728443ba2 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -215,7 +215,7 @@ EOF
}
qemu_check_access() {
- if [ ! -w "$1" ] ; then
+ if [ ! -w "$1" ]; then
echo "ERROR: cannot write to $1" 1>&2
exit 1
fi
@@ -224,12 +224,12 @@ qemu_check_access() {
qemu_check_bintfmt_misc() {
# load the binfmt_misc module
if [ ! -d /proc/sys/fs/binfmt_misc ]; then
- if ! /sbin/modprobe binfmt_misc ; then
+ if ! /sbin/modprobe binfmt_misc; then
exit 1
fi
fi
if [ ! -f /proc/sys/fs/binfmt_misc/register ]; then
- if ! mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc ; then
+ if ! mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc; then
exit 1
fi
fi
@@ -242,16 +242,16 @@ installed_dpkg() {
}
qemu_check_debian() {
- if [ ! -e /etc/debian_version ] ; then
+ if [ ! -e /etc/debian_version ]; then
echo "WARNING: your system is not a Debian based distro" 1>&2
- elif ! installed_dpkg binfmt-support ; then
+ elif ! installed_dpkg binfmt-support; then
echo "WARNING: package binfmt-support is needed" 1>&2
fi
qemu_check_access "$EXPORTDIR"
}
qemu_check_systemd() {
- if ! systemctl -q is-enabled systemd-binfmt.service ; then
+ if ! systemctl -q is-enabled systemd-binfmt.service; then
echo "WARNING: systemd-binfmt.service is missing or disabled" 1>&2
fi
qemu_check_access "$EXPORTDIR"
@@ -259,10 +259,10 @@ qemu_check_systemd() {
qemu_generate_register() {
flags=""
- if [ "$CREDENTIAL" = "yes" ] ; then
+ if [ "$CREDENTIAL" = "yes" ]; then
flags="OC"
fi
- if [ "$PERSISTENT" = "yes" ] ; then
+ if [ "$PERSISTENT" = "yes" ]; then
flags="${flags}F"
fi
@@ -295,23 +295,23 @@ qemu_set_binfmts() {
# register the interpreter for each cpu except for the native one
- for cpu in ${qemu_target_list} ; do
+ for cpu in ${qemu_target_list}; do
magic=$(eval echo \$${cpu}_magic)
mask=$(eval echo \$${cpu}_mask)
family=$(eval echo \$${cpu}_family)
- if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ] ; then
+ if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ]; then
echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2
continue
fi
qemu="$QEMU_PATH/qemu-$cpu"
- if [ "$cpu" = "i486" ] ; then
+ if [ "$cpu" = "i486" ]; then
qemu="$QEMU_PATH/qemu-i386"
fi
qemu="$qemu$QEMU_SUFFIX"
- if [ "$host_family" != "$family" ] ; then
+ if [ "$host_family" != "$family" ]; then
$BINFMT_SET
fi
done
@@ -331,7 +331,7 @@ QEMU_SUFFIX=""
options=$(getopt -o ds:Q:S:e:hc:p: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent: -- "$@")
eval set -- "$options"
-while true ; do
+while true; do
case "$1" in
-d|--debian)
CHECK=qemu_check_debian
@@ -344,14 +344,14 @@ while true ; do
EXPORTDIR=${EXPORTDIR:-$SYSTEMDDIR}
shift
# check given cpu is in the supported CPU list
- if [ "$1" != "ALL" ] ; then
- for cpu in ${qemu_target_list} ; do
- if [ "$cpu" = "$1" ] ; then
+ if [ "$1" != "ALL" ]; then
+ for cpu in ${qemu_target_list}; do
+ if [ "$cpu" = "$1" ]; then
break
fi
done
- if [ "$cpu" = "$1" ] ; then
+ if [ "$cpu" = "$1" ]; then
qemu_target_list="$1"
else
echo "ERROR: unknown CPU \"$1\"" 1>&2
--
2.25.1
next prev parent reply other threads:[~2020-03-09 19:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 19:12 [PATCH v10 0/10] qemu-binfmt-conf.sh Unai Martinez-Corral
2020-03-09 19:18 ` Unai Martinez-Corral [this message]
2020-03-09 19:30 ` [PATCH v10 01/10] qemu-binfmt-conf.sh: enforce style consistency Eric Blake
2020-03-09 19:36 ` Unai Martinez Corral
2020-03-10 8:39 ` Laurent Vivier
2020-03-09 19:19 ` [PATCH v10 02/10] qemu-binfmt-conf.sh: enforce safe tests Unai Martinez-Corral
2020-03-09 19:31 ` Eric Blake
2020-03-10 8:28 ` Laurent Vivier
2020-03-10 11:47 ` Eric Blake
2020-03-13 0:15 ` Unai Martinez Corral
2020-03-09 19:19 ` [PATCH v10 03/10] qemu-binfmt-conf.sh: make opts -p and -c boolean Unai Martinez-Corral
2020-03-09 19:20 ` [PATCH v10 04/10] qemu-binfmt-conf.sh: add QEMU_CREDENTIAL and QEMU_PERSISTENT Unai Martinez-Corral
2020-03-10 8:20 ` Laurent Vivier
2020-03-13 0:09 ` Unai Martinez Corral
2020-03-09 19:20 ` [PATCH v10 05/10] qemu-binfmt-conf.sh: use the same presentation format as for qemu-* Unai Martinez-Corral
2020-03-09 19:22 ` [PATCH v10 06/10] qemu-binfmt-conf.sh: remove 'qemu' prefix from cli options Unai Martinez-Corral
2020-03-09 19:22 ` [PATCH v10 07/10] qemu-binfmt-conf.sh: honour QEMU_PATH and/or QEMU_SUFFIX Unai Martinez-Corral
2020-03-09 19:23 ` [PATCH v10 08/10] qemu-binfmt-conf.sh: generalize <CPU> to positional [TARGETS] Unai Martinez-Corral
2020-03-09 19:23 ` [PATCH v10 09/10] qemu-binfmt-conf.sh: add option --clear Unai Martinez-Corral
2020-03-09 19:24 ` [PATCH v10 10/10] qemu-binfmt-conf.sh: add --test Unai Martinez-Corral
2020-03-09 19:58 ` [PATCH v10 0/10] qemu-binfmt-conf.sh no-reply
2020-03-09 20:05 ` no-reply
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=20200309191846.GA65@669c1c222ef4 \
--to=unai.martinezcorral@ehu.eus \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.