* [PATCH] meson: Update meson-buildoptions.sh
@ 2024-07-05 5:49 Zhao Liu
2024-07-05 9:20 ` Daniel P. Berrangé
0 siblings, 1 reply; 4+ messages in thread
From: Zhao Liu @ 2024-07-05 5:49 UTC (permalink / raw)
To: Paolo Bonzini, Marc-André Lureau, Daniel P . Berrangé,
Thomas Huth, Philippe Mathieu-Daudé, qemu-devel
Cc: Zhao Liu
Update meson-buildoptions.sh to stay in sync with meson_options.txt.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
scripts/meson-buildoptions.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index cfadb5ea86af..c97079a38c9e 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -83,7 +83,7 @@ meson_options_help() {
printf "%s\n" ' (can be empty) [qemu]'
printf "%s\n" ' --with-trace-file=VALUE Trace file prefix for simple backend [trace]'
printf "%s\n" ' --x86-version=CHOICE tweak required x86_64 architecture version beyond'
- printf "%s\n" ' compiler default [1] (choices: 0/1/2/3)'
+ printf "%s\n" ' compiler default [1] (choices: 0/1/2/3/4)'
printf "%s\n" ''
printf "%s\n" 'Optional features, enabled with --enable-FEATURE and'
printf "%s\n" 'disabled with --disable-FEATURE, default is enabled if available'
@@ -166,6 +166,7 @@ meson_options_help() {
printf "%s\n" ' qcow1 qcow1 image format support'
printf "%s\n" ' qed qed image format support'
printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)'
+ printf "%s\n" ' qpl Query Processing Library support'
printf "%s\n" ' rbd Ceph block device driver'
printf "%s\n" ' rdma Enable RDMA-based migration'
printf "%s\n" ' replication replication support'
@@ -187,6 +188,7 @@ meson_options_help() {
printf "%s\n" ' tools build support utilities that come with QEMU'
printf "%s\n" ' tpm TPM support'
printf "%s\n" ' u2f U2F emulation support'
+ printf "%s\n" ' uadk UADK Library support'
printf "%s\n" ' usb-redir libusbredir support'
printf "%s\n" ' vde vde network backend support'
printf "%s\n" ' vdi vdi image format support'
@@ -221,8 +223,6 @@ meson_options_help() {
printf "%s\n" ' Xen PCI passthrough support'
printf "%s\n" ' xkbcommon xkbcommon support'
printf "%s\n" ' zstd zstd compression support'
- printf "%s\n" ' qpl Query Processing Library support'
- printf "%s\n" ' uadk UADK Library support'
}
_meson_option_parse() {
case $1 in
@@ -440,6 +440,8 @@ _meson_option_parse() {
--disable-qga-vss) printf "%s" -Dqga_vss=disabled ;;
--enable-qom-cast-debug) printf "%s" -Dqom_cast_debug=true ;;
--disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;;
+ --enable-qpl) printf "%s" -Dqpl=enabled ;;
+ --disable-qpl) printf "%s" -Dqpl=disabled ;;
--enable-rbd) printf "%s" -Drbd=enabled ;;
--disable-rbd) printf "%s" -Drbd=disabled ;;
--enable-rdma) printf "%s" -Drdma=enabled ;;
@@ -501,6 +503,8 @@ _meson_option_parse() {
--disable-tsan) printf "%s" -Dtsan=false ;;
--enable-u2f) printf "%s" -Du2f=enabled ;;
--disable-u2f) printf "%s" -Du2f=disabled ;;
+ --enable-uadk) printf "%s" -Duadk=enabled ;;
+ --disable-uadk) printf "%s" -Duadk=disabled ;;
--enable-usb-redir) printf "%s" -Dusb_redir=enabled ;;
--disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
--enable-vde) printf "%s" -Dvde=enabled ;;
@@ -560,10 +564,6 @@ _meson_option_parse() {
--disable-xkbcommon) printf "%s" -Dxkbcommon=disabled ;;
--enable-zstd) printf "%s" -Dzstd=enabled ;;
--disable-zstd) printf "%s" -Dzstd=disabled ;;
- --enable-qpl) printf "%s" -Dqpl=enabled ;;
- --disable-qpl) printf "%s" -Dqpl=disabled ;;
- --enable-uadk) printf "%s" -Duadk=enabled ;;
- --disable-uadk) printf "%s" -Duadk=disabled ;;
*) return 1 ;;
esac
}
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] meson: Update meson-buildoptions.sh
2024-07-05 5:49 [PATCH] meson: Update meson-buildoptions.sh Zhao Liu
@ 2024-07-05 9:20 ` Daniel P. Berrangé
2024-07-15 13:00 ` Zhao Liu
0 siblings, 1 reply; 4+ messages in thread
From: Daniel P. Berrangé @ 2024-07-05 9:20 UTC (permalink / raw)
To: Zhao Liu
Cc: Paolo Bonzini, Marc-André Lureau, Thomas Huth,
Philippe Mathieu-Daudé, qemu-devel
On Fri, Jul 05, 2024 at 01:49:03PM +0800, Zhao Liu wrote:
> Update meson-buildoptions.sh to stay in sync with meson_options.txt.
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> scripts/meson-buildoptions.sh | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] meson: Update meson-buildoptions.sh
2024-07-05 9:20 ` Daniel P. Berrangé
@ 2024-07-15 13:00 ` Zhao Liu
2024-07-15 12:47 ` Daniel P. Berrangé
0 siblings, 1 reply; 4+ messages in thread
From: Zhao Liu @ 2024-07-15 13:00 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: Paolo Bonzini, Marc-André Lureau, Thomas Huth,
Philippe Mathieu-Daudé, qemu-devel
Hi Daniel,
On Fri, Jul 05, 2024 at 10:20:27AM +0100, Daniel P. Berrangé wrote:
> Date: Fri, 5 Jul 2024 10:20:27 +0100
> From: "Daniel P. Berrangé" <berrange@redhat.com>
> Subject: Re: [PATCH] meson: Update meson-buildoptions.sh
>
> On Fri, Jul 05, 2024 at 01:49:03PM +0800, Zhao Liu wrote:
> > Update meson-buildoptions.sh to stay in sync with meson_options.txt.
> >
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> > scripts/meson-buildoptions.sh | 14 +++++++-------
> > 1 file changed, 7 insertions(+), 7 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
Thanks!
BTW, could you please help merge this change? Because recently this
script has been "polluting" my git staging workspace during
development.
Regards,
Zhao
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] meson: Update meson-buildoptions.sh
2024-07-15 13:00 ` Zhao Liu
@ 2024-07-15 12:47 ` Daniel P. Berrangé
0 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrangé @ 2024-07-15 12:47 UTC (permalink / raw)
To: Zhao Liu
Cc: Paolo Bonzini, Marc-André Lureau, Thomas Huth,
Philippe Mathieu-Daudé, qemu-devel, qemu-trivial
CC qemu-trivial
On Mon, Jul 15, 2024 at 09:00:51PM +0800, Zhao Liu wrote:
> Hi Daniel,
>
> On Fri, Jul 05, 2024 at 10:20:27AM +0100, Daniel P. Berrangé wrote:
> > Date: Fri, 5 Jul 2024 10:20:27 +0100
> > From: "Daniel P. Berrangé" <berrange@redhat.com>
> > Subject: Re: [PATCH] meson: Update meson-buildoptions.sh
> >
> > On Fri, Jul 05, 2024 at 01:49:03PM +0800, Zhao Liu wrote:
> > > Update meson-buildoptions.sh to stay in sync with meson_options.txt.
> > >
> > > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > > ---
> > > scripts/meson-buildoptions.sh | 14 +++++++-------
> > > 1 file changed, 7 insertions(+), 7 deletions(-)
> >
> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> >
>
> Thanks!
>
> BTW, could you please help merge this change? Because recently this
> script has been "polluting" my git staging workspace during
> development.
>
> Regards,
> Zhao
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-15 12:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-05 5:49 [PATCH] meson: Update meson-buildoptions.sh Zhao Liu
2024-07-05 9:20 ` Daniel P. Berrangé
2024-07-15 13:00 ` Zhao Liu
2024-07-15 12:47 ` Daniel P. Berrangé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).