From nobody Wed Apr 2 07:00:14 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 1552418620260392.4394231052031; Tue, 12 Mar 2019 12:23:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:58487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3mzs-0002H5-2z for importer@patchew.org; Tue, 12 Mar 2019 15:23:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3mhA-0002wc-5M for qemu-devel@nongnu.org; Tue, 12 Mar 2019 15:04:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3mh2-00010I-KU for qemu-devel@nongnu.org; Tue, 12 Mar 2019 15:04:07 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:52634 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 1h3mgw-0000pN-V8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 15:04:00 -0400 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id D77B935EE6; Tue, 12 Mar 2019 20:03:54 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC2F911004A; Tue, 12 Mar 2019 20:03:54 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A03AA110045; Tue, 12 Mar 2019 20:03:54 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Tue, 12 Mar 2019 20:03:54 +0100 (CET) Received: from 803a063d172d (unknown [139.47.78.33]) by smtp1 (Postfix) with ESMTPSA id 5A09735EE6; Tue, 12 Mar 2019 20:03:54 +0100 (CET) Date: Tue, 12 Mar 2019 19:03:54 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190312190354.GI15@803a063d172d> References: <20190312185541.GA13@803a063d172d> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190312185541.GA13@803a063d172d> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 172 matched, not delayed by milter-greylist-4.4.3 (smtp1); Tue, 12 Mar 2019 20:03:54 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24486.002 X-TM-AS-Result: No--2.766-7.0-31-10 X-imss-scan-details: No--2.766-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24486.002 X-TMASE-Result: 10--2.765700-10.000000 X-TMASE-MatchedRID: ehvrJQ9m4PA8mRT0SYY6fguB7zdAMUjATJDl9FKHbrkOAHqXajwVGEJy DX3Q0bQuRZ3bsJ5dhK9sy3DPX9Umyv2E4cGVTliSEe5D10MltLYxmbT6wQT2a/HFoBcOsKez02b 9SFcwxUmVdYejSz2J/mFP3OsrR0xZlYSFi/RRLjcXKqR+w9a7UCtovaaHxlUrnQqircTOm4dZhL w6sxHoN/uBAQFQ9xUB363fb6EBgcmPaFHMfVTC4P7E6GNqs6ceXrupZTqDOwZ5w0EauQomR46HM 5rqDwqtAXY01CK5yMt3bHwIkevHfkO03zqdxJSeHHT35V2UcjNZQ2L2Tksawp19yViR0MmyPNNm q03e8HjWrUrFIv1PxK+2Wj7PuZdfnd0mi9KVGdEyLP6R38uSr8pgbEscJ4OHHr9FJo47GSOeuBk 6fpRtlw== 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); Tue, 12 Mar 2019 20:03:54 +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 v6 9/9] qemu-binfmt-conf.sh: add --test 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 | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index c672ec4886..7e7f6e31a6 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -197,8 +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/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 @@ -208,6 +207,8 @@ TARGETS QEMU_TARGETS A single arch nam= e or a list of them (see to the binary to interpret -r|--clear QEMU_CLEAR (yes) remove registered interpreters= for target TARGETS; then exit. +-t|--test QEMU_TEST (yes) test the setup with the provid= ed arguments, but do not + configure any of the interpreters. -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 @@ -221,6 +222,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 : @@ -319,9 +321,6 @@ qemu_set_binfmts() { # reduce the list of target interpreters to those given in the CLI targets=3D${@:-$QEMU_TARGET} - if [ "x$targets" =3D "xNONE" ] ; then - return - fi qemu_check_target_list $targets # register the interpreter for each target except for the native one @@ -370,12 +369,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 rdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,e= xportdir:,help,credential,persistent -- "$@") +options=3D$(getopt -o trdsQ:S:e:hcp -l test,clear,debian,systemd,path:,suf= fix:,exportdir:,help,credential,persistent -- "$@") eval set -- "$options" while true ; do case "$1" in + -t|--test) + QEMU_TEST=3D"yes" + ;; -r|--clear) QEMU_CLEAR=3D"yes" ;; @@ -424,6 +427,11 @@ shift $CHECK +if [ "x$QEMU_TEST" =3D "xyes" ] ; then + BINFMT_SET=3D: + BINFMT_CLEAR=3D: +fi + if [ "x$QEMU_CLEAR" =3D "xyes" ] ; then qemu_check_target_list "$@" for t in $checked_target_list ; do -- 2.21.0