binfmt: Add --ignore-family option

[PATCH v2 1/3] binfmt: Shuffle things around

Posted by Andrea Bolognani 2 months, 1 week ago

This should make no difference from the functional point of
view and it's just preparation for upcoming changes.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 scripts/qemu-binfmt-conf.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 6ef9f118d9..426f075e31 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -318,20 +318,23 @@ qemu_set_binfmts() {
         mask=$(eval echo \$${cpu}_mask)
         family=$(eval echo \$${cpu}_family)
 
+        target="$cpu"
+        if [ "$cpu" = "i486" ] ; then
+            target="i386"
+        fi
+
+        qemu="$QEMU_PATH/qemu-$target$QEMU_SUFFIX"
+
         if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ] ; then
             echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2
             continue
         fi
 
-        qemu="$QEMU_PATH/qemu-$cpu"
-        if [ "$cpu" = "i486" ] ; then
-            qemu="$QEMU_PATH/qemu-i386"
+        if [ "$host_family" = "$family" ] ; then
+            continue
         fi
 
-        qemu="$qemu$QEMU_SUFFIX"
-        if [ "$host_family" != "$family" ] ; then
-            $BINFMT_SET
-        fi
+        $BINFMT_SET
     done
 }
 
-- 
2.48.1

Re: [PATCH v2 1/3] binfmt: Shuffle things around

Posted by Alistair Francis 1 month, 1 week ago

On Tue, Jan 28, 2025 at 4:29 AM Andrea Bolognani <abologna@redhat.com> wrote:
>
> This should make no difference from the functional point of
> view and it's just preparation for upcoming changes.
>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  scripts/qemu-binfmt-conf.sh | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index 6ef9f118d9..426f075e31 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -318,20 +318,23 @@ qemu_set_binfmts() {
>          mask=$(eval echo \$${cpu}_mask)
>          family=$(eval echo \$${cpu}_family)
>
> +        target="$cpu"
> +        if [ "$cpu" = "i486" ] ; then
> +            target="i386"
> +        fi
> +
> +        qemu="$QEMU_PATH/qemu-$target$QEMU_SUFFIX"
> +
>          if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ] ; then
>              echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2
>              continue
>          fi
>
> -        qemu="$QEMU_PATH/qemu-$cpu"
> -        if [ "$cpu" = "i486" ] ; then
> -            qemu="$QEMU_PATH/qemu-i386"
> +        if [ "$host_family" = "$family" ] ; then
> +            continue
>          fi
>
> -        qemu="$qemu$QEMU_SUFFIX"
> -        if [ "$host_family" != "$family" ] ; then
> -            $BINFMT_SET
> -        fi
> +        $BINFMT_SET
>      done
>  }
>
> --
> 2.48.1
>

Re: [PATCH v2 1/3] binfmt: Shuffle things around

Posted by Laurent Vivier 1 month, 1 week ago

Le 27/01/2025 à 19:29, Andrea Bolognani a écrit :
> This should make no difference from the functional point of
> view and it's just preparation for upcoming changes.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>   scripts/qemu-binfmt-conf.sh | 17 ++++++++++-------
>   1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index 6ef9f118d9..426f075e31 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -318,20 +318,23 @@ qemu_set_binfmts() {
>           mask=$(eval echo \$${cpu}_mask)
>           family=$(eval echo \$${cpu}_family)
>   
> +        target="$cpu"
> +        if [ "$cpu" = "i486" ] ; then
> +            target="i386"
> +        fi
> +
> +        qemu="$QEMU_PATH/qemu-$target$QEMU_SUFFIX"
> +
>           if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ] ; then
>               echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2
>               continue
>           fi
>   
> -        qemu="$QEMU_PATH/qemu-$cpu"
> -        if [ "$cpu" = "i486" ] ; then
> -            qemu="$QEMU_PATH/qemu-i386"
> +        if [ "$host_family" = "$family" ] ; then
> +            continue
>           fi
>   
> -        qemu="$qemu$QEMU_SUFFIX"
> -        if [ "$host_family" != "$family" ] ; then
> -            $BINFMT_SET
> -        fi
> +        $BINFMT_SET
>       done
>   }
>   

Reviewed-by: Laurent Vivier <laurent@vivier.eu>