[PATCH 3/5] scripts/meson-buildoptions: Sort coroutine_backend choices lexicographically

Bernhard Beschow posted 5 patches 5 months, 1 week ago
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Bernhard Beschow <shentey@gmail.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
There is a newer version of this series
[PATCH 3/5] scripts/meson-buildoptions: Sort coroutine_backend choices lexicographically
Posted by Bernhard Beschow 5 months, 1 week ago
When changing meson_options.txt, this script gets updated automatically by QEMU
tooling which sorts the choices lexicographically. Fix this in preparation of
the ext patch.

Fixes: ccc403ed5844 ("meson: Add wasm build in build scripts")
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 scripts/meson-buildoptions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index f09ef9604f..73e0770f42 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -80,7 +80,7 @@ meson_options_help() {
   printf "%s\n" '  --tls-priority=VALUE     Default TLS protocol/cipher priority string'
   printf "%s\n" '                           [NORMAL]'
   printf "%s\n" '  --with-coroutine=CHOICE  coroutine backend to use (choices:'
-  printf "%s\n" '                           auto/sigaltstack/ucontext/windows/wasm)'
+  printf "%s\n" '                           auto/sigaltstack/ucontext/wasm/windows)'
   printf "%s\n" '  --with-pkgversion=VALUE  use specified string as sub-version of the'
   printf "%s\n" '                           package'
   printf "%s\n" '  --with-suffix=VALUE      Suffix for QEMU data/modules/config directories'
-- 
2.49.0
Re: [PATCH 3/5] scripts/meson-buildoptions: Sort coroutine_backend choices lexicographically
Posted by Thomas Huth 5 months, 1 week ago
On 10/06/2025 22.41, Bernhard Beschow wrote:
> When changing meson_options.txt, this script gets updated automatically by QEMU
> tooling which sorts the choices lexicographically. Fix this in preparation of
> the ext patch.

s/ext/next/

> Fixes: ccc403ed5844 ("meson: Add wasm build in build scripts")
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   scripts/meson-buildoptions.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> index f09ef9604f..73e0770f42 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -80,7 +80,7 @@ meson_options_help() {
>     printf "%s\n" '  --tls-priority=VALUE     Default TLS protocol/cipher priority string'
>     printf "%s\n" '                           [NORMAL]'
>     printf "%s\n" '  --with-coroutine=CHOICE  coroutine backend to use (choices:'
> -  printf "%s\n" '                           auto/sigaltstack/ucontext/windows/wasm)'
> +  printf "%s\n" '                           auto/sigaltstack/ucontext/wasm/windows)'
>     printf "%s\n" '  --with-pkgversion=VALUE  use specified string as sub-version of the'
>     printf "%s\n" '                           package'
>     printf "%s\n" '  --with-suffix=VALUE      Suffix for QEMU data/modules/config directories'

Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH 3/5] scripts/meson-buildoptions: Sort coroutine_backend choices lexicographically
Posted by Kohei Tokunaga 5 months, 1 week ago
I should've made sure to run the tool, sorry. Thanks for spotting and fixing
this issue.

Reviewed-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
Re: [PATCH 3/5] scripts/meson-buildoptions: Sort coroutine_backend choices lexicographically
Posted by BALATON Zoltan 5 months, 1 week ago
On Tue, 10 Jun 2025, Bernhard Beschow wrote:
> When changing meson_options.txt, this script gets updated automatically by QEMU
> tooling which sorts the choices lexicographically. Fix this in preparation of
> the ext patch.

Typo: next patch

> Fixes: ccc403ed5844 ("meson: Add wasm build in build scripts")
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
> scripts/meson-buildoptions.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> index f09ef9604f..73e0770f42 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -80,7 +80,7 @@ meson_options_help() {
>   printf "%s\n" '  --tls-priority=VALUE     Default TLS protocol/cipher priority string'
>   printf "%s\n" '                           [NORMAL]'
>   printf "%s\n" '  --with-coroutine=CHOICE  coroutine backend to use (choices:'
> -  printf "%s\n" '                           auto/sigaltstack/ucontext/windows/wasm)'
> +  printf "%s\n" '                           auto/sigaltstack/ucontext/wasm/windows)'
>   printf "%s\n" '  --with-pkgversion=VALUE  use specified string as sub-version of the'
>   printf "%s\n" '                           package'
>   printf "%s\n" '  --with-suffix=VALUE      Suffix for QEMU data/modules/config directories'
>