From nobody Wed Apr 2 07:09:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1583607606; cv=none; d=zohomail.com; s=zohoarc; b=IFZCszMmPbpgkflsj8u65DogrYDwyu9OsMtP1L5+jtE7962Rml+r5AB1QBNeLu0laLUr78NTanujmiTibUMDGMCVmY7OU+johDiJjf75DjXAZo05P6u92rETiRqRfn6NlZg8Hj65dbPdDe+lmFAmt1oIj2vb2YtSFgTV7mjRniU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583607606; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=byPL9Sw1cW/cjozCn+Xk3bGueFnelO6hysczxGpTMnI=; b=TsHMYd4Tu6InGdlu/WZwXJXRHyF9DpNdcoI6ZwCSrFF3/Tvc8FAz5xuIw5tHubQQAUhP7G0NGPN7zVwe1PVHwOma7y/maTvCBn6wZY6xKQ+gaI0erglBfnZH6QDXzg9jVBzt9ksY9ZVCbJTKAQA+UM8HxQZxVUiPrSUzMxyCdUo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1583607606507134.76446680667368; Sat, 7 Mar 2020 11:00:06 -0800 (PST) Received: from localhost ([::1]:51898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAeg7-0007QY-ST for importer@patchew.org; Sat, 07 Mar 2020 14:00:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36369) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAebr-0004ta-PS for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:55:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAebq-0005oB-9J for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:55:39 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:52137 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 1jAebp-0005kn-Tj for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:55:38 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id BFD7536F95; Sat, 7 Mar 2020 19:55:36 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 82D3711004A; Sat, 7 Mar 2020 19:55:36 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7689A110045; Sat, 7 Mar 2020 19:55:36 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Sat, 7 Mar 2020 19:55:36 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id 1E63636F95; Sat, 7 Mar 2020 19:55:36 +0100 (CET) Date: Sat, 7 Mar 2020 18:55:35 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v8 8/9] qemu-binfmt-conf.sh: add option --clear Message-ID: <20200307185535.GE45@afee69d503a7> References: <20200307170251.GA7@dd5f6ec33fb0> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200307170251.GA7@dd5f6ec33fb0> X-Greylist: ACL 184 matched, not delayed by milter-greylist-4.6.2 (smtp1 [10.0.100.73]); Sat, 07 Mar 2020 19:55:36 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25276.002 X-TM-AS-Result: No-1.776-7.0-31-10 X-imss-scan-details: No-1.776-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.002 X-TMASE-Result: 10-1.775800-10.000000 X-TMASE-MatchedRID: nrHYWZvpVHs8mRT0SYY6fguB7zdAMUjAFTFJRL+t8UtUjspoiX02FwjJ M0WLRMJtiG9EhTRb6MgfqXaEwlcZyzMn84YoJAVUuoibJpHRrFny++SyyVe4t1eIuu+Gkot8loz PjvqwUQi9tSdZWvLKQKlaEvVRnyvLTIunQAI8qaIH9dSeYYY46tuO3HY6rheDLnnqtQwNeTZIak Kc12XuNGDQNB2SPBIhj0IvV7jlqDi2Kkcom9iYSIvqrlGw2G/kxEksT8U2vYNXsxBNtOXTb9nN+ wKqGAutUGOMO6MZ7Hcdcyf+46K2mXuK0oT3XHU2nFVnNmvv47vqobkz1A0A7atNdpFrZXd80A45 IAXRxM2oa9MPKG95wkC9kO2OSfgdBmjPEm4v5DMoSebb2328i+uLFZZYlisfQ6tklRJO9ij9bMg 3kSk56LG0WsdjH6wrKrauXd3MZDX371moSn0VOPVA6VtlTC888T1pEKV3C+bkEi3bCDx0UbYAPx 8FmtswEwR6GGfJ/2/NbMYCLmNDGnvq3yTFwiBxis4GCuL1lOQ0M/zQmBURphKGdgr8x4f4BBSv+ oarUQsKtuXWKSlXVpNHmClQkxEB+rL5VW+ofZc= 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.6.2 (postfix.smtp1.imsva1 [10.0.100.73]); Sat, 07 Mar 2020 19:55:36 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 158.227.0.66 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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 Reviewed-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index d5d3484b58..9685456747 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -201,7 +201,7 @@ Options and associated environment variables: =20 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) @@ -210,6 +210,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 define where to write configuration = files (default: $SYSTEMDDIR or $DEBIANDIR) -s|--systemd don't write into /proc, generate fil= e(s) for @@ -222,6 +224,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 =20 To import templates with update-binfmts, use : =20 @@ -348,8 +351,22 @@ qemu_set_binfmts() { done } =20 +qemu_clear_notimplemented() { + echo "ERROR: option clear not implemented for this mode yet" 1>&2 + usage + exit 1 +} + +qemu_clear_interpreter() { + p=3D"/proc/sys/fs/binfmt_misc/$1" + if [ -f "$p" ] ; then + printf %s -1 > "$p" + fi +} + CHECK=3Dqemu_check_bintfmt_misc BINFMT_SET=3Dqemu_register_interpreter +BINFMT_CLEAR=3Dqemu_clear_interpreter =20 SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" @@ -359,20 +376,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}" =20 -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" =20 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) @@ -407,4 +430,13 @@ done shift =20 $CHECK + +if [ "x$QEMU_CLEAR" =3D "xyes" ] ; then + qemu_check_target_list "$@" + for t in $checked_target_list ; do + $BINFMT_CLEAR "qemu-$t" + done + exit +fi + qemu_set_binfmts "$@" --=20 2.25.1