From nobody Wed Apr 2 07:28:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552301709206553.6038114414619; Mon, 11 Mar 2019 03:55:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:59492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3IaH-0002xQ-4n for importer@patchew.org; Mon, 11 Mar 2019 06:55:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ID6-0000V0-UI for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:31:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ID5-0001ox-Pm for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:31:08 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:4199 helo=smtp.ehu.eus) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3ID5-0001ng-Dr for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:31:07 -0400 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 087B43F9EF; Mon, 11 Mar 2019 11:31:06 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0D6711004A; Mon, 11 Mar 2019 11:31:05 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B23AF110045; Mon, 11 Mar 2019 11:31:05 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Mon, 11 Mar 2019 11:31:05 +0100 (CET) Received: from 765644dd90e5 (unknown [139.47.78.33]) by smtp1 (Postfix) with ESMTPSA id 17D6F3F371; Mon, 11 Mar 2019 11:31:05 +0100 (CET) Date: Mon, 11 Mar 2019 10:31:06 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190311103106.GG16@765644dd90e5> References: <20190311101428.GA11@765644dd90e5> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190311101428.GA11@765644dd90e5> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 177 matched, not delayed by milter-greylist-4.4.3 (smtp1); Mon, 11 Mar 2019 11:31:05 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24482.007 X-TM-AS-Result: No--3.745-7.0-31-10 X-imss-scan-details: No--3.745-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24482.007 X-TMASE-Result: 10--3.744600-10.000000 X-TMASE-MatchedRID: 5U6uFEJz7+o8mRT0SYY6fguB7zdAMUjAbYZQU1whlX9UjspoiX02F0R7 kF2MEpMASIkcopeTUu6Of30LOspw9AjZsijeXMGW2MZGQuKc8UhaNaxZBRbNWiAWlErg1VlPShc oFt7Iuk8Zw5ucm3NLWkZb9TVWKMA5HKicLVBy7TlbF+jvJlkOpkyQ5fRSh265DgB6l2o8FRhCcg 190NG0LjElClGessEfhZoMPmZo0JQCA8tJOje6Zx+WEMjoO9WWu56wFPSkMVFrMbakJN8OeXA+T B/xXV3gy/xu2cEdn2J+XHMTeEdcYW7vEKjEI8LyHcQQBuf4ZFt9LQinZ4QefHUIH+25YvS80+iQ wApCn9sD+c09Hd/d3MZW5ai5WKlyTLmRaGarDUvAFXoAkXr3Uks/0VIgvWdMwiZha5jCqzUSTUc fU1S1Q7JO/KintjrdNbQAedbmAsA24yhjDGqlNYVEIkZQYOeQzB2k3gHGTljd1q4RlEnwvE0Yg3 c8gM5jSxeH8a3WdLPfsnwfcTQdxA== X-TMASE-SNAP-Result: 1.821001.0001-0-1-12:0,22:0,33:0,34:0-0 X-Greylist: Sender IP whitelisted, Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (postfix.smtp1.imsva1); Mon, 11 Mar 2019 11:31:06 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 158.227.0.66 Subject: [Qemu-devel] [PATCH v4 8/10] qemu-binfmt-conf.sh: add option --clear X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, riku.voipio@iki.fi, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is a partial implementation. Allows to remove a single or a list of already registered binfmt interpreters. Valid values are those in qemu_target_list. If TARGETS is empty, all the existing 'qemu-*' interpreters are removed. This is partial because 'debian' and 'systemd' configurations are not supported. The script will exit with error 'option clear not implemented for this mode yet'. Removal is done by printing '-1' as explained at: https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst Signed-off-by: Unai Martinez-Corral --- scripts/qemu-binfmt-conf.sh | 41 ++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index fde78517ff..07d1ee1f04 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -196,7 +196,7 @@ Options and associated environment variables: Argument Env-variable Description TARGETS QEMU_TARGETS A single arch name or a list of them= (see all names below); - if empty, configure all known target= s; + if empty, configure/clear all known = targets; if 'NONE', no interpreter is configu= red. -h|--help display this usage -Q|--path PATH: QEMU_PATH set path to qemu interpreter(s) @@ -206,9 +206,10 @@ TARGETS QEMU_TARGETS A single arch na= me or a list of them (see systemd-binfmt.service; environment = variable HOST_ARCH allows to override 'uname' to genera= te configuration files for a different architecture than th= e current one. - -e|--exportdir PATH: DEBIANDIR define where to write configuration = files SYSTEMDDIR +-c|--clear: QEMU_CLEAR (yes) remove registered interpreters= for target TARGETS; + then exit. -c|--credential: QEMU_CREDENTIAL (yes) credential and security tokens= are calculated according to the binary to interpret -p|--persistent: QEMU_PERSISTENT (yes) load the interpreter and keep = it in memory; all future @@ -336,6 +337,25 @@ qemu_set_binfmts() { done } +qemu_clear_notimplemented() { + echo "ERROR: option clear not implemented for this mode yet" 1>&2 + usage + exit 1 +} + +qemu_clear_interpreter() { + names=3D'qemu-*' + if [ $# -ne 0 ] ; then + qemu_check_target_list $1 + unset names pre + for t in $checked_target_list ; do + names=3D"${names}${pre}qemu-$t" + pre=3D' -o -name ' + done + fi + find /proc/sys/fs/binfmt_misc/ -type f -name $names -exec sh -c 'print= f %s -1 > {}' \; +} + CHECK=3Dqemu_check_bintfmt_misc BINFMT_SET=3Dqemu_register_interpreter @@ -347,12 +367,16 @@ QEMU_PATH=3D"${QEMU_PATH:-/usr/local/bin}" QEMU_SUFFIX=3D"${QEMU_SUFFIX:-}" QEMU_CREDENTIAL=3D"${QEMU_CREDENTIAL:-no}" QEMU_PERSISTENT=3D"${QEMU_PERSISTENT:-no}" +QEMU_CLEAR=3D"${QEMU_CLEAR:-no}" -options=3D$(getopt -o dsQ:S:e:hcp -l debian,systemd,path:,suffix:,exportdi= r:,help,credential,persistent -- "$@") +options=3D$(getopt -o cdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,e= xportdir:,help,credential,persistent -- "$@") eval set -- "$options" while true ; do case "$1" in + -c|--clear) + QEMU_CLEAR=3D"yes" + ;; -d|--debian) CHECK=3Dqemu_check_debian BINFMT_SET=3Dqemu_generate_debian @@ -395,4 +419,15 @@ done shift $CHECK + +if [ "x$QEMU_CLEAR" =3D "xyes" ] ; then + case "$BINFMT_SET" in + *debian) BINFMT_CLEAR=3Dqemu_clear_notimplemented ;; + *systemd) BINFMT_CLEAR=3Dqemu_clear_notimplemented ;; + *) BINFMT_CLEAR=3Dqemu_clear_interpreter + esac + $BINFMT_CLEAR "$@" + exit +fi + qemu_set_binfmts "$@" -- 2.21.0