With more than three years since Meson was introduced in the build system, people
have had quite some time to move away from the foo-softmmu/qemu-system-* and
foo-linux-user/qemu-* symbolic links.  Remove them, and with them another
instance of the "softmmu" name for system emulators.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/configure b/configure
index ff058d6c486..9cdb5a6818b 100755
--- a/configure
+++ b/configure
@@ -1605,21 +1605,11 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
 echo "MESON=$meson" >> $config_host_mak
 echo "NINJA=$ninja" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
-
 # use included Linux headers for KVM architectures
 if test "$host_os" = "linux" && test -n "$linux_arch"; then
   symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
 fi
 
-for target in $target_list; do
-    target_dir="$target"
-    target_name=$(echo $target | cut -d '-' -f 1)$EXESUF
-    case $target in
-        *-user) symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" ;;
-        *) symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_name" ;;
-    esac
-done
-
 if test "$default_targets" = "yes"; then
   echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
 fi
-- 
2.43.0

On 29/01/2024 14.36, Paolo Bonzini wrote:
> With more than three years since Meson was introduced in the build system, people
> have had quite some time to move away from the foo-softmmu/qemu-system-* and
> foo-linux-user/qemu-* symbolic links.  Remove them, and with them another
> instance of the "softmmu" name for system emulators.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   configure | 10 ----------
>   1 file changed, 10 deletions(-)
> 
> diff --git a/configure b/configure
> index ff058d6c486..9cdb5a6818b 100755
> --- a/configure
> +++ b/configure
> @@ -1605,21 +1605,11 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
>   echo "MESON=$meson" >> $config_host_mak
>   echo "NINJA=$ninja" >> $config_host_mak
>   echo "EXESUF=$EXESUF" >> $config_host_mak
> -

Maybe keep the empty line here?

>   # use included Linux headers for KVM architectures
>   if test "$host_os" = "linux" && test -n "$linux_arch"; then
>     symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
>   fi
>   
> -for target in $target_list; do
> -    target_dir="$target"
> -    target_name=$(echo $target | cut -d '-' -f 1)$EXESUF
> -    case $target in
> -        *-user) symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" ;;
> -        *) symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_name" ;;
> -    esac
> -done
> -

Anyway,
Reviewed-by: Thomas Huth <thuth@redhat.com>

On Mon, Jan 29, 2024 at 2:46 PM Thomas Huth <thuth@redhat.com> wrote:
>
> On 29/01/2024 14.36, Paolo Bonzini wrote:
> > With more than three years since Meson was introduced in the build system, people
> > have had quite some time to move away from the foo-softmmu/qemu-system-* and
> > foo-linux-user/qemu-* symbolic links.  Remove them, and with them another
> > instance of the "softmmu" name for system emulators.
> >
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> >   configure | 10 ----------
> >   1 file changed, 10 deletions(-)
> >
> > diff --git a/configure b/configure
> > index ff058d6c486..9cdb5a6818b 100755
> > --- a/configure
> > +++ b/configure
> > @@ -1605,21 +1605,11 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
> >   echo "MESON=$meson" >> $config_host_mak
> >   echo "NINJA=$ninja" >> $config_host_mak
> >   echo "EXESUF=$EXESUF" >> $config_host_mak
> > -
>
> Maybe keep the empty line here?

Even better, the "if" can be moved with the other creation of symlinks from
$source_path to the build tree.

Paolo

> >   # use included Linux headers for KVM architectures
> >   if test "$host_os" = "linux" && test -n "$linux_arch"; then
> >     symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
> >   fi
> >
> > -for target in $target_list; do
> > -    target_dir="$target"
> > -    target_name=$(echo $target | cut -d '-' -f 1)$EXESUF
> > -    case $target in
> > -        *-user) symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" ;;
> > -        *) symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_name" ;;
> > -    esac
> > -done
> > -
>
> Anyway,
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
>