[PATCH] meson: re-generate scripts/meson-buildoptions.sh to fix IGVM entry

Stefano Garzarella posted 1 patch 4 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20250717131256.157383-1-sgarzare@redhat.com
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
scripts/meson-buildoptions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] meson: re-generate scripts/meson-buildoptions.sh to fix IGVM entry
Posted by Stefano Garzarella 4 months ago
From: Stefano Garzarella <sgarzare@redhat.com>

Commit 84fe49d94a ("meson: Add optional dependency on IGVM library")
was inconsistent with the contents of meson_options.txt and the one
generated in scripts/meson-buildoptions.sh

Let's regenerate the file in this way to keep them consistent and prevent
future changes from including the spurious diff:

    touch meson_options.txt
    make update-buildoptions

Fixes: 84fe49d94a ("meson: Add optional dependency on IGVM library")
Cc: roy.hopkins@randomman.co.uk
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.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 e8504689e8..0ebe6bc52a 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -130,7 +130,7 @@ meson_options_help() {
   printf "%s\n" '  hv-balloon      hv-balloon driver (requires Glib 2.68+ GTree API)'
   printf "%s\n" '  hvf             HVF acceleration support'
   printf "%s\n" '  iconv           Font glyph conversion support'
-  printf "%s\n" '  igvm            IGVM file support'
+  printf "%s\n" '  igvm            Independent Guest Virtual Machine (IGVM) file support'
   printf "%s\n" '  jack            JACK sound support'
   printf "%s\n" '  keyring         Linux keyring support'
   printf "%s\n" '  kvm             KVM acceleration support'
-- 
2.50.1


Re: [PATCH] meson: re-generate scripts/meson-buildoptions.sh to fix IGVM entry
Posted by Paolo Bonzini 4 months ago
Queued, thanks.

Paolo
Re: [PATCH] meson: re-generate scripts/meson-buildoptions.sh to fix IGVM entry
Posted by Manos Pitsidianakis 4 months ago
On Thu, Jul 17, 2025 at 6:00 PM Stefano Garzarella <sgarzare@redhat.com> wrote:
>
> From: Stefano Garzarella <sgarzare@redhat.com>
>
> Commit 84fe49d94a ("meson: Add optional dependency on IGVM library")
> was inconsistent with the contents of meson_options.txt and the one
> generated in scripts/meson-buildoptions.sh
>
> Let's regenerate the file in this way to keep them consistent and prevent
> future changes from including the spurious diff:
>
>     touch meson_options.txt
>     make update-buildoptions
>
> Fixes: 84fe49d94a ("meson: Add optional dependency on IGVM library")
> Cc: roy.hopkins@randomman.co.uk
> Reported-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.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 e8504689e8..0ebe6bc52a 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -130,7 +130,7 @@ meson_options_help() {
>    printf "%s\n" '  hv-balloon      hv-balloon driver (requires Glib 2.68+ GTree API)'
>    printf "%s\n" '  hvf             HVF acceleration support'
>    printf "%s\n" '  iconv           Font glyph conversion support'
> -  printf "%s\n" '  igvm            IGVM file support'
> +  printf "%s\n" '  igvm            Independent Guest Virtual Machine (IGVM) file support'
>    printf "%s\n" '  jack            JACK sound support'
>    printf "%s\n" '  keyring         Linux keyring support'
>    printf "%s\n" '  kvm             KVM acceleration support'
> --
> 2.50.1
>
>

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>