From nobody Thu Apr  3 16:40:10 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: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1552417632109493.6478471614979;
 Tue, 12 Mar 2019 12:07:12 -0700 (PDT)
Received: from localhost ([127.0.0.1]:58174 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1h3mjy-0005L7-SJ
	for importer@patchew.org; Tue, 12 Mar 2019 15:07:06 -0400
Received: from eggs.gnu.org ([209.51.188.92]:51245)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <unai.martinezcorral@ehu.eus>) id 1h3mel-0000Db-Qq
	for qemu-devel@nongnu.org; Tue, 12 Mar 2019 15:01:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <unai.martinezcorral@ehu.eus>) id 1h3mbx-0003Pn-Lz
	for qemu-devel@nongnu.org; Tue, 12 Mar 2019 14:58:53 -0400
Received: from smtp.lg.ehu.es ([158.227.0.66]:30932 helo=smtp.ehu.eus)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <unai.martinezcorral@ehu.eus>)
	id 1h3mbu-0003Hn-62
	for qemu-devel@nongnu.org; Tue, 12 Mar 2019 14:58:47 -0400
Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245])
	by postfix.smtp1.imsva1 (Postfix) with ESMTPS id C3FB7348FD;
	Tue, 12 Mar 2019 19:58:42 +0100 (CET)
Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1])
	by IMSVA (Postfix) with ESMTP id 8FFF511004A;
	Tue, 12 Mar 2019 19:58:42 +0100 (CET)
Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1])
	by IMSVA (Postfix) with ESMTP id 838E2110045;
	Tue, 12 Mar 2019 19:58:42 +0100 (CET)
Received: from smtp.ehu.eus (unknown [10.0.100.73])
	by imsva1.lgp.ehu.es (Postfix) with ESMTPS;
	Tue, 12 Mar 2019 19:58:42 +0100 (CET)
Received: from 803a063d172d (unknown [139.47.78.33])
	by smtp1 (Postfix) with ESMTPSA id 3E0E1348FD;
	Tue, 12 Mar 2019 19:58:42 +0100 (CET)
Date: Tue, 12 Mar 2019 18:58:42 +0000
From: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
To: qemu-devel@nongnu.org
Message-ID: <20190312185842.GD15@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 177 matched, not delayed by milter-greylist-4.4.3 (smtp1);
	Tue, 12 Mar 2019 19:58:42 +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--1.497-7.0-31-10
X-imss-scan-details: No--1.497-7.0-31-10
X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24486.002
X-TMASE-Result: 10--1.497400-10.000000
X-TMASE-MatchedRID: mafpUJSAc1A8mRT0SYY6fgPZZctd3P4B+Gz435tISEGUdmT0Eka3cn4z
	9jl2IgzvgML9UOgCBPexXMuu/NKBHrDyQVN2cGlR4bl1FkKDELfUqhJbkmLVezUsHjosUACSnFq
	TWUo/GE0z6xRyeDQUk9rR3zP0abjQZgDJ5bVJkeT/VoEOchXiKVObpRiWjuVrVI7KaIl9Nhfy+k
	xyAtKJyeLzNWBegCW2U/185JqDvmbaqT6lqWS9QsRB0bsfrpPInxMyeYT53Rnqgq1DnggCDGwFT
	Q39W9xdeyZIlW6gyg5kP5xKaRbCUu4+reWx1nB2PCdoNmqyCTPkdKEiuQCDM2wU/lss/Fz4EbVM
	wXjsOT3pn6fQaYYfBmEZXwGzbQsWLOeM/yNfYDnlrtxuq+PMxVZca9RSYo/b
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 19:58:42 +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 4/9] qemu-binfmt-conf.sh: use the same
 presentation format as for qemu-*
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: riku.voipio@iki.fi, laurent@vivier.eu
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
---
 scripts/qemu-binfmt-conf.sh | 63 +++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index ad9ae731a0..5ac1df680b 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -167,47 +167,48 @@ qemu_get_family() {

 usage() {
     cat <<EOF
-Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU]
-                           [--help][--credential][--exportdir PATH]
-                           [--persistent][--qemu-suffix SUFFIX]
+Usage: qemu-binfmt-conf.sh [options]

-       Configure binfmt_misc to use qemu interpreter
+Configure binfmt_misc to use qemu interpreter

-       --help:        display this usage
-       --qemu-path:   set path to qemu interpreter ($QEMU_PATH)
-       --qemu-suffix: add a suffix to the default interpreter name
-       --debian:      don't write into /proc,
-                      instead generate update-binfmts templates
-       --systemd:     don't write into /proc,
-                      instead generate file for systemd-binfmt.service
-                      for the given CPU. If CPU is "ALL", generate a
-                      file for all known cpus
-       --exportdir:   define where to write configuration files
-                      (default: $SYSTEMDDIR or $DEBIANDIR)
-       --credential:  if present, credential and security tokens are
-                      calculated according to the binary to interpret
-                      ($QEMU_CREDENTIAL=3Dyes)
-       --persistent:  if present, the interpreter is loaded when binfmt is
-                      configured and remains in memory. All future uses
-                      are cloned from the open file.
-                      ($QEMU_PERSISTENT=3Dyes)
+Options and associated environment variables:

-    To import templates with update-binfmts, use :
+Argument             Env-variable     Description
+-h|--help                             display this usage
+-Q|--qemu-path PATH  QEMU_PATH        set path to qemu interpreter
+-F|--qemu-suffix SUFFIX               add a suffix to the default interpre=
ter name
+-p|--persistent      QEMU_PERSISTENT  (yes) load the interpreter and keep =
it in memory; all future
+                                      uses are cloned from the open file.
+-c|--credential      QEMU_CREDENTIAL  (yes) credential and security tokens=
 are calculated according
+                                      to the binary to interpret
+-e|--exportdir PATH                   define where to write configuration =
files
+                                      (default: $SYSTEMDDIR or $DEBIANDIR)
+-s|--systemd CPU                      don't write into /proc, generate fil=
e for
+                                      systemd-binfmt.service for the given=
 CPU; if CPU is "ALL",
+                                      generate a file for all known cpus.
+-d|--debian                           don't write into /proc, generate upd=
ate-binfmts templates

-        sudo update-binfmts --importdir ${EXPORTDIR:-$DEBIANDIR} --import =
qemu-CPU
+Defaults:
+QEMU_PATH=3D$QEMU_PATH
+QEMU_PERSISTENT=3D$QEMU_PERSISTENT
+QEMU_CREDENTIAL=3D$QEMU_CREDENTIAL

-    To remove interpreter, use :
+To import templates with update-binfmts, use :

-        sudo update-binfmts --package qemu-CPU --remove qemu-CPU $QEMU_PATH
+    sudo update-binfmts --importdir ${EXPORTDIR:-$DEBIANDIR} --import qemu=
-CPU

-    With systemd, binfmt files are loaded by systemd-binfmt.service
+To remove interpreter, use :

-    The environment variable HOST_ARCH allows to override 'uname' to gener=
ate
-    configuration files for a different architecture than the current one.
+    sudo update-binfmts --package qemu-CPU --remove qemu-CPU $QEMU_PATH

-    where CPU is one of:
+With systemd, binfmt files are loaded by systemd-binfmt.service

-        $qemu_target_list
+The environment variable HOST_ARCH allows to override 'uname' to generate =
configuration files for a
+different architecture than the current one.
+
+where CPU is one of:
+
+    $qemu_target_list

 EOF
 }
--
2.21.0