| Message ID | 20220905204114.208969-1-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | build: Regenerate meson-buildoptions.sh | expand |
On 5/9/22 22:41, Richard Henderson wrote: > Regeneration was missed by the previous update. > > Fixes: 2a2359b84407 ("vduse-blk: Implement vduse-blk export") > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > scripts/meson-buildoptions.sh | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh > index 359b04e0e6..300ba8b212 100644 > --- a/scripts/meson-buildoptions.sh > +++ b/scripts/meson-buildoptions.sh > @@ -42,12 +42,13 @@ meson_options_help() { > printf "%s\n" ' --enable-trace-backends=CHOICES' > printf "%s\n" ' Set available tracing backends [log] (choices:' > printf "%s\n" ' dtrace/ftrace/log/nop/simple/syslog/ust)' > - printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-firmware]' > + printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-' > + printf "%s\n" ' firmware]' This path split is not very handy to copy/paste. > printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler' > printf "%s\n" ' --includedir=VALUE Header file directory [include]' > printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for' > printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]' > - printf "%s\n" ' --libdir=VALUE Library directory [lib64]' > + printf "%s\n" ' --libdir=VALUE Library directory [lib/x86_64-linux-gnu]' This patch seems distro-specific (previous to this patch). Anyhow: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Mon, 5 Sept 2022 at 16:41, Richard Henderson <richard.henderson@linaro.org> wrote: > > Regeneration was missed by the previous update. > > Fixes: 2a2359b84407 ("vduse-blk: Implement vduse-blk export") > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > scripts/meson-buildoptions.sh | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh > index 359b04e0e6..300ba8b212 100644 > --- a/scripts/meson-buildoptions.sh > +++ b/scripts/meson-buildoptions.sh > @@ -42,12 +42,13 @@ meson_options_help() { > printf "%s\n" ' --enable-trace-backends=CHOICES' > printf "%s\n" ' Set available tracing backends [log] (choices:' > printf "%s\n" ' dtrace/ftrace/log/nop/simple/syslog/ust)' > - printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-firmware]' > + printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-' > + printf "%s\n" ' firmware]' > printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler' > printf "%s\n" ' --includedir=VALUE Header file directory [include]' > printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for' > printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]' > - printf "%s\n" ' --libdir=VALUE Library directory [lib64]' > + printf "%s\n" ' --libdir=VALUE Library directory [lib/x86_64-linux-gnu]' Uh oh, this is distro-specific. Does this mean meson-buildoptions.sh output is unstable? Stefan
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 359b04e0e6..300ba8b212 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -42,12 +42,13 @@ meson_options_help() { printf "%s\n" ' --enable-trace-backends=CHOICES' printf "%s\n" ' Set available tracing backends [log] (choices:' printf "%s\n" ' dtrace/ftrace/log/nop/simple/syslog/ust)' - printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-firmware]' + printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-' + printf "%s\n" ' firmware]' printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler' printf "%s\n" ' --includedir=VALUE Header file directory [include]' printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for' printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]' - printf "%s\n" ' --libdir=VALUE Library directory [lib64]' + printf "%s\n" ' --libdir=VALUE Library directory [lib/x86_64-linux-gnu]' printf "%s\n" ' --libexecdir=VALUE Library executable directory [libexec]' printf "%s\n" ' --localedir=VALUE Locale data directory [share/locale]' printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]' @@ -154,6 +155,8 @@ meson_options_help() { printf "%s\n" ' usb-redir libusbredir support' printf "%s\n" ' vde vde network backend support' printf "%s\n" ' vdi vdi image format support' + printf "%s\n" ' vduse-blk-export' + printf "%s\n" ' VDUSE block export support' printf "%s\n" ' vfio-user-server' printf "%s\n" ' vfio-user server support' printf "%s\n" ' vhost-crypto vhost-user crypto backend support' @@ -162,8 +165,6 @@ meson_options_help() { printf "%s\n" ' vhost-user vhost-user backend support' printf "%s\n" ' vhost-user-blk-server' printf "%s\n" ' build vhost-user-blk server' - printf "%s\n" ' vduse-blk-export' - printf "%s\n" ' VDUSE block export support' printf "%s\n" ' vhost-vdpa vhost-vdpa kernel backend support' printf "%s\n" ' virglrenderer virgl rendering support' printf "%s\n" ' virtfs virtio-9p support' @@ -422,6 +423,8 @@ _meson_option_parse() { --disable-vde) printf "%s" -Dvde=disabled ;; --enable-vdi) printf "%s" -Dvdi=enabled ;; --disable-vdi) printf "%s" -Dvdi=disabled ;; + --enable-vduse-blk-export) printf "%s" -Dvduse_blk_export=enabled ;; + --disable-vduse-blk-export) printf "%s" -Dvduse_blk_export=disabled ;; --enable-vfio-user-server) printf "%s" -Dvfio_user_server=enabled ;; --disable-vfio-user-server) printf "%s" -Dvfio_user_server=disabled ;; --enable-vhost-crypto) printf "%s" -Dvhost_crypto=enabled ;; @@ -434,8 +437,6 @@ _meson_option_parse() { --disable-vhost-user) printf "%s" -Dvhost_user=disabled ;; --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;; --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;; - --enable-vduse-blk-export) printf "%s" -Dvduse_blk_export=enabled ;; - --disable-vduse-blk-export) printf "%s" -Dvduse_blk_export=disabled ;; --enable-vhost-vdpa) printf "%s" -Dvhost_vdpa=enabled ;; --disable-vhost-vdpa) printf "%s" -Dvhost_vdpa=disabled ;; --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;
Regeneration was missed by the previous update. Fixes: 2a2359b84407 ("vduse-blk: Implement vduse-blk export") Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- scripts/meson-buildoptions.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)