aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-04 22:38:10 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-04 22:38:10 +0100
commitfe8d2d5737ab20ed0118863f5eb888cae37122ab (patch)
treed81f2f9b693e45dda9704b984a6e815b71a19e78 /scripts
parent6d8ad1614e0c97c59a87e6c6208ebeb94e769149 (diff)
parent377e93e9e85e76c7fd7af900ba965743243a6618 (diff)
downloadqemu-fe8d2d5737ab20ed0118863f5eb888cae37122ab.zip
qemu-fe8d2d5737ab20ed0118863f5eb888cae37122ab.tar.gz
qemu-fe8d2d5737ab20ed0118863f5eb888cae37122ab.tar.bz2
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging
Some strace cleanups Minor fixes for setsockopt() and netlink Manage 'F' flag with qemu-binfmt-conf.sh # gpg: Signature made Tue 03 Jul 2018 17:34:20 BST # gpg: using RSA key F30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" # gpg: aka "Laurent Vivier <laurent@vivier.eu>" # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/linux-user-for-3.0-pull-request: linux-user/strace: Improve recvmsg() output linux-user/strace: Improve capget()/capset() output linux-user: update do_setsockopt() linux-user: add netlink CARRIER_UP_COUNT/CARRIER_DOWN_COUNT qemu-binfmt-conf.sh: allow to provide a suffix to the interpreter name qemu-binfmt-conf.sh: add persistent (F) flags qemu-binfmt-conf.sh: cleanup --credential Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/qemu-binfmt-conf.sh64
1 files changed, 41 insertions, 23 deletions
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index a5cb96d..b0dc8a7 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -165,21 +165,26 @@ usage() {
cat <<EOF
Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU]
[--help][--credential yes|no][--exportdir PATH]
+ [--persistent yes|no][--qemu-suffix SUFFIX]
Configure binfmt_misc to use qemu interpreter
- --help: display this usage
- --qemu-path: set path to qemu interpreter ($QEMU_PATH)
- --debian: don't write into /proc,
- instead generate update-binfmts templates
- --systemd: don't write into /proc,
- instead generate file for systemd-binfmt.service
- for the given CPU. If CPU is "ALL", generate a
- file for all known cpus
- --exportdir: define where to write configuration files
- (default: $SYSTEMDDIR or $DEBIANDIR)
- --credential: if yes, credential and security tokens are
- calculated according to the binary to interpret
+ --help: display this usage
+ --qemu-path: set path to qemu interpreter ($QEMU_PATH)
+ --qemu-suffix: add a suffix to the default interpreter name
+ --debian: don't write into /proc,
+ instead generate update-binfmts templates
+ --systemd: don't write into /proc,
+ instead generate file for systemd-binfmt.service
+ for the given CPU. If CPU is "ALL", generate a
+ file for all known cpus
+ --exportdir: define where to write configuration files
+ (default: $SYSTEMDDIR or $DEBIANDIR)
+ --credential: if yes, credential and security tokens are
+ calculated according to the binary to interpret
+ --persistent: if yes, the interpreter is loaded when binfmt is
+ configured and remains in memory. All future uses
+ are cloned from the open file.
To import templates with update-binfmts, use :
@@ -245,7 +250,15 @@ qemu_check_systemd() {
}
qemu_generate_register() {
- echo ":qemu-$cpu:M::$magic:$mask:$qemu:$FLAGS"
+ flags=""
+ if [ "$CREDENTIAL" = "yes" ] ; then
+ flags="OC"
+ fi
+ if [ "$PERSISTENT" = "yes" ] ; then
+ flags="${flags}F"
+ fi
+
+ echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags"
}
qemu_register_interpreter() {
@@ -264,10 +277,8 @@ package qemu-$cpu
interpreter $qemu
magic $magic
mask $mask
+credential $CREDENTIAL
EOF
- if [ "$FLAGS" = "OC" ] ; then
- echo "credentials yes" >> "$EXPORTDIR/qemu-$cpu"
- fi
}
qemu_set_binfmts() {
@@ -291,6 +302,7 @@ qemu_set_binfmts() {
qemu="$QEMU_PATH/qemu-i386"
fi
+ qemu="$qemu$QEMU_SUFFIX"
if [ "$host_family" != "$family" ] ; then
$BINFMT_SET
fi
@@ -304,9 +316,11 @@ SYSTEMDDIR="/etc/binfmt.d"
DEBIANDIR="/usr/share/binfmts"
QEMU_PATH=/usr/local/bin
-FLAGS=""
+CREDENTIAL=no
+PERSISTENT=no
+QEMU_SUFFIX=""
-options=$(getopt -o ds:Q:e:hc: -l debian,systemd:,qemu-path:,exportdir:,help,credential: -- "$@")
+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
@@ -342,6 +356,10 @@ while true ; do
shift
QEMU_PATH="$1"
;;
+ -F|--qemu-suffix)
+ shift
+ QEMU_SUFFIX="$1"
+ ;;
-e|--exportdir)
shift
EXPORTDIR="$1"
@@ -352,11 +370,11 @@ while true ; do
;;
-c|--credential)
shift
- if [ "$1" = "yes" ] ; then
- FLAGS="OC"
- else
- FLAGS=""
- fi
+ CREDENTIAL="$1"
+ ;;
+ -p|--persistent)
+ shift
+ PERSISTENT="$1"
;;
*)
break