From patchwork Sat Mar 7 17:22:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Unai Martinez Corral X-Patchwork-Id: 1250922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ehu.eus Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ZWXv0145z9sPK for ; Sun, 8 Mar 2020 04:23:26 +1100 (AEDT) Received: from localhost ([::1]:51036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdAa-0006FL-SY for incoming@patchwork.ozlabs.org; Sat, 07 Mar 2020 12:23:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52271) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdAC-00067U-ND for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:23:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAdAA-0006LH-20 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:22:59 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:23868 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 1jAdA9-0006GA-Mc for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:22:58 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id ACCD13825B; Sat, 7 Mar 2020 18:22:55 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5F2A311004A; Sat, 7 Mar 2020 18:22:55 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 52C98110045; Sat, 7 Mar 2020 18:22:55 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Sat, 7 Mar 2020 18:22:55 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id 0E3D53852D; Sat, 7 Mar 2020 18:22:54 +0100 (CET) Date: Sat, 7 Mar 2020 17:22:48 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v8 1/9] qemu-binfmt-conf.sh: enforce safe style consistency Message-ID: <20200307172248.GA9@afee69d503a7> MIME-Version: 1.0 Content-Disposition: inline X-Greylist: ACL 184 matched, not delayed by milter-greylist-4.6.2 (smtp1 [10.0.100.73]); Sat, 07 Mar 2020 18:22:55 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25276.001 X-TM-AS-Result: No-0.108-7.0-31-10 X-imss-scan-details: No-0.108-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.001 X-TMASE-Result: 10-0.108400-10.000000 X-TMASE-MatchedRID: AvuQOGDihJo8mRT0SYY6frBZAi3nrnzbopGQY5bbP3KQsRqSXMRkV//v RwcN6CxcWk3vlkEkcgdqAxBaFFZ85HTKrg3nLjv1A9lly13c/gEEa8g1x8eqFzL/GHoao0dVgm7 WCykPm9Q9E3MQ72s42pG96/hbJzFNSulibHZJx6EvLP1C8DIeOuuLFZZYlisfQ6tklRJO9ij9bM g3kSk56LG0WsdjH6wrKrauXd3MZDX371moSn0VOMz/CtjUqsbyxz9rP9TWxuBvW+kI3v1nLJi+R f9itKUQlDqYxZzV3eDCaeyUt/P3/ctZSdlP7Xii9SPW45P4yzatXkfeF49j3hKGdgr8x4f4BBSv +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 18:22:55 +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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Spaces are added before '; then', for consistency. All the tests are prefixed with 'x', in order to avoid risky comparisons (i.e. a user deliberately trying to provoke a syntax error). Signed-off-by: Unai Martinez-Corral Reviewed-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 9f1580a91c..672ce716b6 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -223,12 +223,12 @@ qemu_check_access() { qemu_check_bintfmt_misc() { # load the binfmt_misc module - if [ ! -d /proc/sys/fs/binfmt_misc ]; then + if [ ! -d /proc/sys/fs/binfmt_misc ] ; then if ! /sbin/modprobe binfmt_misc ; then exit 1 fi fi - if [ ! -f /proc/sys/fs/binfmt_misc/register ]; then + if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then if ! mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc ; then exit 1 fi @@ -259,10 +259,10 @@ qemu_check_systemd() { qemu_generate_register() { flags="" - if [ "$CREDENTIAL" = "yes" ] ; then + if [ "x$CREDENTIAL" = "xyes" ] ; then flags="OC" fi - if [ "$PERSISTENT" = "yes" ] ; then + if [ "x$PERSISTENT" = "xyes" ] ; then flags="${flags}F" fi @@ -300,18 +300,18 @@ qemu_set_binfmts() { mask=$(eval echo \$${cpu}_mask) family=$(eval echo \$${cpu}_family) - if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ] ; then + if [ "x$magic" = "x" ] || [ "x$mask" = "x" ] || [ "x$family" = "x" ] ; then echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2 continue fi qemu="$QEMU_PATH/qemu-$cpu" - if [ "$cpu" = "i486" ] ; then + if [ "x$cpu" = "xi486" ] ; then qemu="$QEMU_PATH/qemu-i386" fi qemu="$qemu$QEMU_SUFFIX" - if [ "$host_family" != "$family" ] ; then + if [ "x$host_family" != "x$family" ] ; then $BINFMT_SET fi done From patchwork Sat Mar 7 17:27:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Unai Martinez Corral X-Patchwork-Id: 1250925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ehu.eus Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ZWff5MHZz9sPK for ; Sun, 8 Mar 2020 04:28:26 +1100 (AEDT) Received: from localhost ([::1]:51106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdFQ-0003kA-6z for incoming@patchwork.ozlabs.org; Sat, 07 Mar 2020 12:28:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52885) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdEn-0003MH-TZ for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:27:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAdEm-0000GU-8E for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:27:45 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:55658 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 1jAdEl-0008UY-T1 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:27:44 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id BA07B3760E; Sat, 7 Mar 2020 18:27:41 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8213611004A; Sat, 7 Mar 2020 18:27:41 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 75EAB110045; Sat, 7 Mar 2020 18:27:41 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Sat, 7 Mar 2020 18:27:41 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id 314103760E; Sat, 7 Mar 2020 18:27:41 +0100 (CET) Date: Sat, 7 Mar 2020 17:27:40 +0000 From: umarcor To: qemu-devel@nongnu.org Subject: [PATCH v8 2/9] qemu-binfmt-conf.sh: make opts -p and -c boolean Message-ID: <20200307172740.GB9@afee69d503a7> MIME-Version: 1.0 Content-Disposition: inline X-Greylist: ACL 184 matched, not delayed by milter-greylist-4.6.2 (smtp1 [10.0.100.73]); Sat, 07 Mar 2020 18:27:41 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25276.001 X-TM-AS-Result: No--0.283-7.0-31-10 X-imss-scan-details: No--0.283-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.001 X-TMASE-Result: 10--0.282600-10.000000 X-TMASE-MatchedRID: U43YD7H1Lvw8mRT0SYY6fn4neC0h7SADM0wEwxpnA/68YDH/UBNnm9IS YzBUt2RaPNUcTj3KnwYYtU40WMXvIYG80L1SbJgHPwKTD1v8YV5MkOX0UoduuUp12IXZajx5isV L6tesfykTxXC00El2lhakbZdr8IRbe4rShPdcdTacVWc2a+/ju3MewI65KqfWA1njkhEhkqD1Ze b7KEkrKJ++W6npokaOY8uDPjNciyEZhPwmib0kjeLzNWBegCW2U/185JqDvmbaqT6lqWS9QsRB0 bsfrpPI34T9cYMsdwwOJox114k7L4utkPfYpmAOoHq+Hs/zrWEhua9uUgMKZ1axhI27yKUYa37u +lQw2jslgZqICCEoWYmUFS1V970DoMDl4vNmLhBQ8Ijyfb7R1NaR6eevSLMI3+Sfk+YbswR/XNh OvrwWA7UAzM040TIQ 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 18:27:41 +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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch breaks backward compatibility. Both '--persistent' and '--credential' default to 'no'. Hence, '-p no' or '-c no' are redundant. Overall, accepting an argument might be misleading because options are, indeed, boolean. This patch makes both options boolean in getopt, so if any of them is provided the corresponding variable is set to true. Signed-off-by: Unai Martinez-Corral Reviewed-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 672ce716b6..75eb19c3bf 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -172,8 +172,8 @@ qemu_get_family() { usage() { cat < X-Patchwork-Id: 1250926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ehu.eus Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ZWj10zwTz9sPK for ; Sun, 8 Mar 2020 04:30:29 +1100 (AEDT) Received: from localhost ([::1]:51124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdHP-0005MH-3I for incoming@patchwork.ozlabs.org; Sat, 07 Mar 2020 12:30:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53227) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdH5-0005M5-AL for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:30:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAdH4-0008Mq-7r for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:30:07 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:13792 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 1jAdH3-0008Km-Si for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:30:06 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 66B8A3825B; Sat, 7 Mar 2020 18:30:04 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 27F6E11004D; Sat, 7 Mar 2020 18:30:04 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 25171110045; Sat, 7 Mar 2020 18:30:04 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Sat, 7 Mar 2020 18:30:04 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id CD7C23760E; Sat, 7 Mar 2020 18:30:03 +0100 (CET) Date: Sat, 7 Mar 2020 17:30:02 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v8 3/9] qemu-binfmt-conf.sh: add QEMU_CREDENTIAL and QEMU_PERSISTENT Message-ID: <20200307173002.GC9@afee69d503a7> MIME-Version: 1.0 Content-Disposition: inline X-Greylist: ACL 184 matched, not delayed by milter-greylist-4.6.2 (smtp1 [10.0.100.73]); Sat, 07 Mar 2020 18:30:04 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25276.001 X-TM-AS-Result: No-1.919-7.0-31-10 X-imss-scan-details: No-1.919-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.001 X-TMASE-Result: 10-1.919100-10.000000 X-TMASE-MatchedRID: ehvrJQ9m4PA8mRT0SYY6fo6MisxJraxH9e5am3m57X1irg8tJChsdOp9 RpeIFYR4f+3yqvQrlggtpxclXgLOJWJZXQNDzktSKrDHzH6zmUVzHsCOuSqn1gNZ45IRIZKg9WX m+yhJKyifvlup6aJGjuGJ0uaQ7XfxDvX2Sk47fs+VyEX4i+SWU+wlOGZoQVV0DpCUEeEFm7A8HP DFMN8fIiE3155ICPJPmyiLZetSf8mfYwIIcLjjbeGANVBCTxXNC24oEZ6SpSk6XEE7Yhw4FjYhL YVN7agli63pxu/S4xQSFXeoRq3xmaeqmMHxXeINQHHENQU9/NzPbq/ALUNTOmZgCXkOZpTlzpuq aZzc8oIUzt6CYykYPCtxJPipEDOM5s49x043aLlHPwBafde3Eazr0/cAC14wuP7sWlKY/sdnIxZ yJs78kg== 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 18:30:04 +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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Allow to set options '--persistent' and/or '--credential' through environment variables. If not defined, defaults are used ('no'). Anyway, command-line arguments have priority over environment variables. Signed-off-by: Unai Martinez-Corral Reviewed-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 75eb19c3bf..347cddf698 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -190,9 +190,11 @@ Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU] (default: $SYSTEMDDIR or $DEBIANDIR) --credential: if present, credential and security tokens are calculated according to the binary to interpret + (QEMU_CREDENTIAL=yes) --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=yes) To import templates with update-binfmts, use : @@ -259,10 +261,10 @@ qemu_check_systemd() { qemu_generate_register() { flags="" - if [ "x$CREDENTIAL" = "xyes" ] ; then + if [ "x$QEMU_CREDENTIAL" = "xyes" ] ; then flags="OC" fi - if [ "x$PERSISTENT" = "xyes" ] ; then + if [ "x$QEMU_PERSISTENT" = "xyes" ] ; then flags="${flags}F" fi @@ -285,7 +287,7 @@ package qemu-$cpu interpreter $qemu magic $magic mask $mask -credential $CREDENTIAL +credential $QEMU_CREDENTIAL EOF } @@ -324,8 +326,10 @@ SYSTEMDDIR="/etc/binfmt.d" DEBIANDIR="/usr/share/binfmts" QEMU_PATH=/usr/local/bin -CREDENTIAL=no -PERSISTENT=no + +QEMU_PERSISTENT="${QEMU_PERSISTENT:-no}" +QEMU_CREDENTIAL="${QEMU_CREDENTIAL:-no}" + QEMU_SUFFIX="" options=$(getopt -o ds:Q:S:e:hcp -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential,persistent -- "$@") @@ -377,10 +381,10 @@ while true ; do exit 1 ;; -c|--credential) - CREDENTIAL="yes" + QEMU_CREDENTIAL="yes" ;; -p|--persistent) - PERSISTENT="yes" + QEMU_PERSISTENT="yes" ;; *) break From patchwork Sat Mar 7 17:32:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Unai Martinez Corral X-Patchwork-Id: 1250927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ehu.eus Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ZWld6X6Jz9sPK for ; Sun, 8 Mar 2020 04:32:45 +1100 (AEDT) Received: from localhost ([::1]:51152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdJb-00070m-IY for incoming@patchwork.ozlabs.org; Sat, 07 Mar 2020 12:32:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53649) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdJ8-000700-JP for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:32:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAdJ6-0001C3-Rj for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:32:13 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:32238 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 1jAdJ6-0000xx-GF for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:32:12 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 7C74821BB8; Sat, 7 Mar 2020 18:32:10 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2C60E11004A; Sat, 7 Mar 2020 18:32:10 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 20349110045; Sat, 7 Mar 2020 18:32: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 18:32:10 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id CDF0421BB8; Sat, 7 Mar 2020 18:32:09 +0100 (CET) Date: Sat, 7 Mar 2020 17:32:08 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v8 4/9] qemu-binfmt-conf.sh: use the same presentation format as for qemu-* Message-ID: <20200307173208.GD9@afee69d503a7> MIME-Version: 1.0 Content-Disposition: inline X-Greylist: ACL 184 matched, not delayed by milter-greylist-4.6.2 (smtp1 [10.0.100.73]); Sat, 07 Mar 2020 18:32:10 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25276.001 X-TM-AS-Result: No--1.297-7.0-31-10 X-imss-scan-details: No--1.297-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.001 X-TMASE-Result: 10--1.297000-10.000000 X-TMASE-MatchedRID: T3hsd5K8wIA8mRT0SYY6fj8Ckw9b/GFeTJDl9FKHbrlKddiF2Wo8ecRx XgwTt4PF3EJA0FSQihWISVF+XOaYFHFnJN0+hJldcI7vRACwF0LKIqAq0jIHigaYevV4zG3ZB5Z kNX8n24FEpOrteNkNyzDw0BFh4qwrXPQvn/00CLFM0MpnLn+G9Gr+GymfohKdVI7KaIl9NheBev ioG5gI930tCKdnhB58dQgf7bli9LzT6JDACkKf2wP5zT0d393cymsk/wUE4hpG3z85bKXlcN1JW yEnC+KUVWGXHrwx1nHvDMd9ZEuNquvd8pBEKhMU+8VCAXGty6Fu/iwIil2Mi2bnSFR79tDE13hs igVleNSHG0SUTQyRe1i7FP9SiiauF1qISuK4qVqjyqnhL+I3r7GxzFzvrCh6QwymtxuJ6y0= 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 18:32:10 +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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Unai Martinez-Corral --- 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 347cddf698..251a78a2ce 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -171,47 +171,48 @@ qemu_get_family() { usage() { cat <