From nobody Wed Apr 2 06:58:36 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 1552301337708489.47772713885297; Mon, 11 Mar 2019 03:48:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:59398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3IUF-00063L-4q for importer@patchew.org; Mon, 11 Mar 2019 06:48:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3IE4-0001EG-UK for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:32:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3IE3-0002Uq-WE for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:32:08 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:39728 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 1h3IE3-0002U6-Jx for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:32:07 -0400 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id A92AB3543B; Mon, 11 Mar 2019 11:32:06 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 72BF711004A; Mon, 11 Mar 2019 11:32:06 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6680E110045; Mon, 11 Mar 2019 11:32:06 +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:32:06 +0100 (CET) Received: from 765644dd90e5 (unknown [139.47.78.33]) by smtp1 (Postfix) with ESMTPSA id 23CF83543B; Mon, 11 Mar 2019 11:32:06 +0100 (CET) Date: Mon, 11 Mar 2019 10:32:07 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190311103207.GI16@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:32:06 +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.777-7.0-31-10 X-imss-scan-details: No--3.777-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24482.007 X-TMASE-Result: 10--3.776600-10.000000 X-TMASE-MatchedRID: mZljRXDwq+48mRT0SYY6fguB7zdAMUjATJDl9FKHbrkOAHqXajwVGEJy DX3Q0bQuRZ3bsJ5dhK9sy3DPX9Umyv2E4cGVTliSEe5D10MltLYxmbT6wQT2a0GXVUrSf9og0Bh ZSjgdIiQl96awcRp/H9Y8C3fBtGbSsPJBU3ZwaVEXKqR+w9a7UCtovaaHxlUrnQqircTOm4dZhL w6sxHoN/uBAQFQ9xUB363fb6EBgck3w8RYxvfC2J4CIKY/Hg3AyJ1gFgOMhOkZsIdvLTjL2AAYN QKSVsYiJ0RPnyOnrZJO1lExTtIe4mrToSQbfcN0eJYx8nRhkgu4KwrMqw1KloGZ8SOkEIrDY2Tj sCvm+QfI6gZwDVY5w4PdoJ+Ed4XtagK3F3j+A3MtYxPiXZi/gvpLWCjI8l+Q7ud3JJLO6dEChFw JzaK8RcV/c5PoaFg8 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:32: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 10/10] qemu-binfmt-conf.sh: add --test|--dry-run 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" Signed-off-by: Unai Martinez-Corral --- scripts/qemu-binfmt-conf.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index a516181a3a..db85798e76 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -196,8 +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/clear all known = targets; - if 'NONE', no interpreter is configu= red. + if empty, configure/clear all known = targets. -h|--help display this usage -Q|--path PATH: QEMU_PATH set path to qemu interpreter(s) -F|--suffix SUFFIX: QEMU_SUFFIX add a suffix to the default interpre= ter name @@ -209,6 +208,8 @@ TARGETS QEMU_TARGETS A single arch nam= e or a list of them (see SYSTEMDDIR -c|--clear: QEMU_CLEAR (yes) remove registered interpreters= for target TARGETS; then exit. +-t|--test|--dry-run: QEMU_TEST (yes) test the setup with the provid= ed arguments, but do not + configure any of the interpreters. -s|--systemd: don't write into /proc, generate fil= e(s) for systemd-binfmt.service; environment = variable HOST_ARCH allows to override 'uname' to genera= te configuration files @@ -222,6 +223,7 @@ QEMU_SUFFIX=3D$QEMU_SUFFIX QEMU_PERSISTENT=3D$QEMU_PERSISTENT QEMU_CREDENTIAL=3D$QEMU_CREDENTIAL QEMU_CLEAR=3D$QEMU_CLEAR +QEMU_TEST=3D$QEMU_TEST To import templates with update-binfmts, use : @@ -317,9 +319,6 @@ qemu_set_binfmts() { # reduce the list of target interpreters to those given in the CLI [ $# -eq 0 ] && targets=3D"${QEMU_TARGETS:-}" || targets=3D"$@" - if [ "x$targets" =3D "xNONE" ] ; then - return - fi qemu_check_target_list $targets # register the interpreter for each target except for the native one @@ -376,12 +375,16 @@ QEMU_SUFFIX=3D"${QEMU_SUFFIX:-}" QEMU_PERSISTENT=3D"${QEMU_PERSISTENT:-no}" QEMU_CREDENTIAL=3D"${QEMU_CREDENTIAL:-no}" QEMU_CLEAR=3D"${QEMU_CLEAR:-no}" +QEMU_TEST=3D"${QEMU_TEST:-no}" -options=3D$(getopt -o cdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,e= xportdir:,help,credential,persistent -- "$@") +options=3D$(getopt -o tcdsQ:S:e:hcp -l test,dry-runclear,debian,systemd,pa= th:,suffix:,exportdir:,help,credential,persistent -- "$@") eval set -- "$options" while true ; do case "$1" in + -t|--test|--dry-run) + QEMU_TEST=3D"yes" + ;; -c|--clear) QEMU_CLEAR=3D"yes" ;; @@ -438,4 +441,10 @@ if [ "x$QEMU_CLEAR" =3D "xyes" ] ; then exit fi +if [ "x$QEMU_TEST" =3D "xyes" ] ; then + skip(){ + :;} + BINFMT_SET=3Dskip +fi + qemu_set_binfmts "$@" -- 2.21.0