From nobody Wed Apr 2 07:05:29 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=1583607412; cv=none; d=zohomail.com; s=zohoarc; b=NlxhWHNVGyITEioIZ1zCW3L76OkCPOezyp8qu7cboPlwrFw/EjXo30+1t9a6u1IFrrNNVwkCDp2OK6mZVwnOfBdgiepJgvblHudUhk0n1UbEEyD6+FYVCFaENHQkAMqG1fW4+ZrLOg5unRRUE1FAgjsqPGovfb6j5JV6AzT3izg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583607412; 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=85+NlyYJyAeaOIjoEDZS36+gFzry2H4jLwJFFJCU7Dg=; b=jpXoZhNa3RMrHGgbT5XpEjoZU6kpGDuM7aTjPXNfL+Qt73EMaaH9hmI4BXGEx1BL/2AsmqTHKKkcv/4BruogZ3IXRMKu6+uo6WD46COkXCXRwREFjArAOGCTwAwNzbRrA/F/XLiGzzyb5BMeVLZUQZvFAnPY9yGDGgOyS2fTFWM= 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 1583607412360488.099616446862; Sat, 7 Mar 2020 10:56:52 -0800 (PST) Received: from localhost ([::1]:51878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAed1-0005vH-Fw for importer@patchew.org; Sat, 07 Mar 2020 13:56:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36447) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAecP-0005Qf-U8 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:56:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAecO-0006jE-Pr for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:56:13 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:37479 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 1jAecO-0006gD-Eg for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:56:12 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 0811E36F95; Sat, 7 Mar 2020 19:56:11 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D150211004A; Sat, 7 Mar 2020 19:56:10 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C5648110045; Sat, 7 Mar 2020 19:56:10 +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:56:10 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id 7FB7336F95; Sat, 7 Mar 2020 19:56:10 +0100 (CET) Date: Sat, 7 Mar 2020 18:56:09 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v8 9/9] qemu-binfmt-conf.sh: add --test Message-ID: <20200307185609.GF45@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:56:10 +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--2.997-7.0-31-10 X-imss-scan-details: No--2.997-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.002 X-TMASE-Result: 10--2.997200-10.000000 X-TMASE-MatchedRID: 4y9/ylYYqyY8mRT0SYY6fguB7zdAMUjAnVQTrXdqB1rGkE1bT11zTEAc 6DyoS2rIKnoLoDc7CX1BeUNELByi+f217Ks8q26/amOGWbsSIFenU+NxqV3DDUYza41dGqxSCn+ QUnj5ZKiuQih3+HqEP/uCK8CpbZE5P0RMDgPThrXagiRcLo6XQOHCwRwMNQUW4ZmC0TPZtojHK3 DBP8Kop+0+/68r4mWd+5zC6D5RoqsO9fZKTjt+z5XIRfiL5JZTAp+UH372RZUjNNPmQPqs4J4CI KY/Hg3AyJ1gFgOMhOkZsIdvLTjL2AAYNQKSVsYiwrbXMGDYqV8HTT+SR4FPABjtt0x+lU92LFiG Ovf3yPPkPGGaxXXHxV54s+vj71IOm6C1NINufeRSR6Juxne78syT8f6LnvnzUJR1Jh/1hk5coWw 5/2ERXzQw5IQ87EEy6fuXT+JI9EvhYXsqMOmRhhqQohjffj3k 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:56:11 +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: 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 Reviewed-by: Laurent Vivier --- 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 9685456747..4635871e6d 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -201,8 +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/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 @@ -212,6 +211,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 @@ -225,6 +226,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 =20 To import templates with update-binfmts, use : =20 @@ -323,9 +325,6 @@ qemu_set_binfmts() { =20 # 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 =20 # register the interpreter for each target except for the native one @@ -377,12 +376,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}" =20 -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" =20 while true ; do case "$1" in + -t|--test) + QEMU_TEST=3D"yes" + ;; -r|--clear) QEMU_CLEAR=3D"yes" ;; @@ -431,6 +434,11 @@ shift =20 $CHECK =20 +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 --=20 2.25.1