From nobody Wed Apr 2 06:55:57 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 1552336340277249.97420957969803; Mon, 11 Mar 2019 13:32:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:39912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Ram-0004lB-OO for importer@patchew.org; Mon, 11 Mar 2019 16:32:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3RSD-0005dp-EP for qemu-devel@nongnu.org; Mon, 11 Mar 2019 16:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3RSB-0002FL-V6 for qemu-devel@nongnu.org; Mon, 11 Mar 2019 16:23:21 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:42098 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 1h3RS9-00029z-Vl for qemu-devel@nongnu.org; Mon, 11 Mar 2019 16:23:19 -0400 Received: from imsva2.lgp.ehu.es (imsva2.lgp.ehu.es [10.0.3.246]) by postfix.smtp2.imsva2 (Postfix) with ESMTPS id 862DB11FE9; Mon, 11 Mar 2019 21:23:16 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 60B205A04F; Mon, 11 Mar 2019 21:23:16 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 55BFC5A045; Mon, 11 Mar 2019 21:23:16 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.76]) by imsva2.lgp.ehu.es (Postfix) with ESMTPS; Mon, 11 Mar 2019 21:23:16 +0100 (CET) Received: from 59ca1d9b7985 (unknown [139.47.78.33]) by smtp2 (Postfix) with ESMTPSA id 11C6111FE9; Mon, 11 Mar 2019 21:23:16 +0100 (CET) Date: Mon, 11 Mar 2019 20:23:19 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190311202319.GH9@59ca1d9b7985> References: <20190311201532.GA6@59ca1d9b7985> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190311201532.GA6@59ca1d9b7985> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 179 matched, not delayed by milter-greylist-4.4.3 (smtp2); Mon, 11 Mar 2019 21:23:16 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24484.002 X-TM-AS-Result: No--3.663-7.0-31-10 X-imss-scan-details: No--3.663-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24484.002 X-TMASE-Result: 10--3.662800-10.000000 X-TMASE-MatchedRID: x/EPlNU2vY08mRT0SYY6fguB7zdAMUjAbYZQU1whlX9UjspoiX02F0R7 kF2MEpMASIkcopeTUu6Of30LOspw9AjZsijeXMGW2MZGQuKc8UhaNaxZBRbNWiAWlErg1VlPShc oFt7Iuk8Zw5ucm3NLWkZb9TVWKMA5HKicLVBy7TlbF+jvJlkOpkyQ5fRSh265DgB6l2o8FRhCcg 190NG0LjElClGessEfhZoMPmZo0JT7zsWX+owtEwbU2RwCZ1Hgu56wFPSkMVGtj24Xqh0yXDvd4 jBDU8JFTJZ7Yn5FNw9lk+8lAsWWM+tFrKm0WeV6ydRP56yRRA9LxPtqS8Bm55soi2XrUn/Jn2MC CHC4423hgDVQQk8VzQtuKBGekqUpnH7sbImOEBQi9eA+aj/7MuKzQ5jWjjPhHfvBoD7eCf4I4bv 6ViQKNQQf8XBSe9tTorpKYENGnVAUHp6imQt5xfTiEA7KQPbeRkXwgWHvVes30cTauf45PGeo9j jtMW5CM6tJ7nFBn5COQFE7dAFoFLAUyUg9ogFt 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.smtp2.imsva2); Mon, 11 Mar 2019 21:23:16 +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 v5 8/9] 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: 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 | 39 +++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 2be9867727..382bdaabfe 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -197,7 +197,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,6 +206,8 @@ TARGETS QEMU_TARGETS A single arch nam= e or a list of them (see uses are cloned from the open file. -c|--credential QEMU_CREDENTIAL (yes) credential and security tokens= are calculated according to the binary to interpret +-r|--clear QEMU_CLEAR (yes) remove registered interpreters= for target TARGETS; + then exit. -e|--exportdir PATH DEBIANDIR define where to write configuration = files SYSTEMDDIR -s|--systemd don't write into /proc, generate fil= e(s) for @@ -218,6 +220,7 @@ QEMU_PATH=3D$QEMU_PATH QEMU_SUFFIX=3D$QEMU_SUFFIX QEMU_PERSISTENT=3D$QEMU_PERSISTENT QEMU_CREDENTIAL=3D$QEMU_CREDENTIAL +QEMU_CLEAR=3D$QEMU_CLEAR To import templates with update-binfmts, use : @@ -344,8 +347,28 @@ 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 'pri= ntf %s -1 > {}' \; +} + CHECK=3Dqemu_check_bintfmt_misc BINFMT_SET=3Dqemu_register_interpreter +BINFMT_CLEAR=3Dqemu_clear_interpreter SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" @@ -355,20 +378,26 @@ QEMU_PATH=3D"${QEMU_PATH:-/usr/local/bin}" QEMU_SUFFIX=3D"${QEMU_SUFFIX:-}" QEMU_PERSISTENT=3D"${QEMU_PERSISTENT:-no}" QEMU_CREDENTIAL=3D"${QEMU_CREDENTIAL:-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 rdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,e= xportdir:,help,credential,persistent -- "$@") eval set -- "$options" while true ; do case "$1" in + -r|--clear) + QEMU_CLEAR=3D"yes" + ;; -d|--debian) CHECK=3Dqemu_check_debian BINFMT_SET=3Dqemu_generate_debian + BINFMT_CLEAR=3Dqemu_clear_notimplemented EXPORTDIR=3D${EXPORTDIR:-$DEBIANDIR} ;; -s|--systemd) CHECK=3Dqemu_check_systemd BINFMT_SET=3Dqemu_generate_systemd + BINFMT_CLEAR=3Dqemu_clear_notimplemented EXPORTDIR=3D${EXPORTDIR:-$SYSTEMDDIR} ;; -Q|--path) @@ -403,4 +432,10 @@ done shift $CHECK + +if [ "x$QEMU_CLEAR" =3D "xyes" ] ; then + $BINFMT_CLEAR "$@" + exit +fi + qemu_set_binfmts "$@" -- 2.21.0