[PATCH v2 0/8] testing/next (without-features, gitlab, python)

[PATCH v2 0/8] testing/next (without-features, gitlab, python)

[Alex Bennée]

Hi,

A quick turnaround from the version I posted yesterday. I've cleaned
up the --without-default-devices stuff thanks to Paolo's feedback and
it's a big win on binary size cutting my qemu-system-aarch64 to around
a 1/3rd of it's normal size. I've also enable -Werror for tests/tcg.

All still need some review tags.

Alex Bennée (8):
  configure: include moxie-softmmu in deprecated_targets_list
  gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build
  configure: move gettext detection to meson.build
  configure: add --without-default-features
  python: add __repr__ to ConsoleSocket to aid debugging
  gitlab: move --without-default-devices build from Travis
  gitlab: add --without-default-features build
  tests/tcg: build tests with -Werror

 configure                     | 179 +++++++++++++++++-----------------
 .gitlab-ci.d/crossbuilds.yml  |   6 +-
 .gitlab-ci.yml                |  16 ++-
 .travis.yml                   |   8 --
 meson_options.txt             |   2 +-
 po/meson.build                |   2 +-
 python/qemu/console_socket.py |   7 ++
 tests/tcg/Makefile.target     |   2 +-
 8 files changed, 119 insertions(+), 103 deletions(-)

-- 
2.20.1

[PATCH v2 1/8] configure: include moxie-softmmu in deprecated_targets_list

[Alex Bennée]

We still build it but there is no point including it in the normal
builds as it is ushered out of the door.

Fixes: 4258c8e221 ("docs/system/deprecated: Mark the 'moxie' CPU as deprecated")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 configure      | 2 +-
 .gitlab-ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 18c26e0389..8f2095a2db 100755
--- a/configure
+++ b/configure
@@ -1610,7 +1610,7 @@ if [ "$ARCH" = "unknown" ]; then
 fi
 
 default_target_list=""
-deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
+deprecated_targets_list=moxie-softmmu,ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
 deprecated_features=""
 mak_wilds=""
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98bff03b47..b3bcaacf7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@ build-deprecated:
     IMAGE: debian-all-test-cross
     CONFIGURE_ARGS: --disable-docs --disable-tools
     MAKE_CHECK_ARGS: build-tcg
-    TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
+    TARGETS: moxie-softmmu ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
       unicore32-softmmu
   artifacts:
     expire_in: 2 days
-- 
2.20.1

[PATCH v2 2/8] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build

[Alex Bennée]

Otherwise we miss coverage of KVM support in the cross build. To
balance it out add arm-softmmu (no kvm, subset of aarch64),
cris-softmmu and ppc-softmmu to the exclude list which do get coverage
elsewhere.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .gitlab-ci.d/crossbuilds.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index bd6473a75a..fcc1b95290 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -7,9 +7,9 @@
     - cd build
     - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
       ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user
-        --target-list-exclude="aarch64-softmmu i386-softmmu microblaze-softmmu
-          mips-softmmu mipsel-softmmu mips64-softmmu ppc64-softmmu sh4-softmmu
-          xtensa-softmmu"
+        --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu
+          microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu
+          ppc-softmmu sh4-softmmu xtensa-softmmu"
     - make -j$(expr $(nproc) + 1) all check-build
 
 # Job to cross-build specific accelerators.
-- 
2.20.1

[PATCH v2 3/8] configure: move gettext detection to meson.build

[Alex Bennée]

This will allow meson to honour -Dauto_features=disabled later.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 configure         | 19 +++----------------
 meson_options.txt |  2 +-
 po/meson.build    |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index 8f2095a2db..46fdea88c7 100755
--- a/configure
+++ b/configure
@@ -448,7 +448,7 @@ libdaxctl=""
 meson=""
 ninja=""
 skip_meson=no
-gettext=""
+gettext="auto"
 
 bogus_os="no"
 malloc_trim="auto"
@@ -1014,9 +1014,9 @@ for opt do
   ;;
   --enable-vnc) vnc="enabled"
   ;;
-  --disable-gettext) gettext="false"
+  --disable-gettext) gettext="disabled"
   ;;
-  --enable-gettext) gettext="true"
+  --enable-gettext) gettext="enabled"
   ;;
   --oss-lib=*) oss_lib="$optarg"
   ;;
@@ -2839,19 +2839,6 @@ if test "$xen_pci_passthrough" != "disabled"; then
   fi
 fi
 
-##########################################
-# gettext probe
-if test "$gettext" != "false" ; then
-  if has xgettext; then
-    gettext=true
-  else
-    if test "$gettext" = "true" ; then
-      feature_not_found "gettext" "Install xgettext binary"
-    fi
-    gettext=false
-  fi
-fi
-
 ##########################################
 # X11 probe
 if $pkg_config --exists "x11"; then
diff --git a/meson_options.txt b/meson_options.txt
index f6f64785fe..191e848600 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,7 @@ option('sphinx_build', type : 'string', value : '',
 
 option('docs', type : 'feature', value : 'auto',
        description: 'Documentations build support')
-option('gettext', type : 'boolean', value : true,
+option('gettext', type : 'feature', value : 'auto',
        description: 'Localization of the GTK+ user interface')
 option('install_blobs', type : 'boolean', value : true,
        description: 'install provided firmware blobs')
diff --git a/po/meson.build b/po/meson.build
index 1387fd979a..a863f0575f 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,6 +1,6 @@
 i18n = import('i18n')
 
-if get_option('gettext')
+if find_program('xgettext', required: get_option('gettext')).found()
   i18n.gettext(meson.project_name(),
                args: '--msgid-bugs-address=qemu-devel@nongnu.org',
                preset: 'glib')
-- 
2.20.1

[PATCH v2 4/8] configure: add --without-default-features

[Alex Bennée]

By default QEMU enables a lot of features if it can probe and find the
support libraries. It also enables a bunch of features by default.
This patch adds the ability to build --without-default-features which
can be paired with a --without-default-devices for a barely functional
build.

The main use case for this is testing our build assumptions and for
minimising the amount of stuff you build if you just want to test a
particular feature on your relatively slow emulated test system. On
it's own I go from:

  $ ls -lh qemu-system-aarch64
  -rwxr-xr-x 1 alex alex 120M Dec 10 12:45 qemu-system-aarch64*
  $ ldd qemu-system-aarch64 | wc -l
  170

to:

  $ ls -lh qemu-aarch64
  -rwxr-xr-x 1 alex alex 43M Dec 10 12:41 qemu-aarch64*
  $ ldd qemu-system-aarch64 | wc -l
  57

which is still able to run my default Debian ARM64 machine with a lot
less fat involved.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - use ${default_feature:-yes} instead of default_yes_features
  - pass -Dauto_features=disabled to meson
  - add some numbers to commit message
---
 configure | 158 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 87 insertions(+), 71 deletions(-)

diff --git a/configure b/configure
index 46fdea88c7..11f5878a59 100755
--- a/configure
+++ b/configure
@@ -291,10 +291,22 @@ unset target_list_exclude
 #
 # Always add --enable-foo and --disable-foo command line args.
 # Distributions want to ensure that several features are compiled in, and it
-# is impossible without a --enable-foo that exits if a feature is not found.
+# is impossible without a --enable-foo that exits if a feature is not
+# found.
 
-brlapi=""
-curl=""
+default_feature=""
+# parse CC options second
+for opt do
+  optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
+  case "$opt" in
+      --without-default-features)
+          default_feature="no"
+  ;;
+  esac
+done
+
+brlapi="$default_feature"
+curl="$default_feature"
 iconv="auto"
 curses="auto"
 docs="auto"
@@ -303,52 +315,52 @@ netmap="no"
 sdl="auto"
 sdl_image="auto"
 virtiofsd="auto"
-virtfs=""
+virtfs="$default_feature"
 libudev="auto"
 mpath="auto"
 vnc="enabled"
 sparse="auto"
-vde=""
+vde="$default_feature"
 vnc_sasl="auto"
 vnc_jpeg="auto"
 vnc_png="auto"
 xkbcommon="auto"
-xen=""
-xen_ctrl_version=""
+xen="$default_feature"
+xen_ctrl_version="$default_feature"
 xen_pci_passthrough="auto"
-linux_aio=""
-linux_io_uring=""
-cap_ng=""
-attr=""
-libattr=""
-xfs=""
+linux_aio="$default_feature"
+linux_io_uring="$default_feature"
+cap_ng="$default_feature"
+attr="$default_feature"
+libattr="$default_feature"
+xfs="$default_feature"
 tcg="enabled"
-membarrier=""
-vhost_net=""
-vhost_crypto=""
-vhost_scsi=""
-vhost_vsock=""
+membarrier="$default_feature"
+vhost_net="$default_feature"
+vhost_crypto="$default_feature"
+vhost_scsi="$default_feature"
+vhost_vsock="$default_feature"
 vhost_user="no"
 vhost_user_blk_server="auto"
-vhost_user_fs=""
+vhost_user_fs="$default_feature"
 kvm="auto"
 hax="auto"
 hvf="auto"
 whpx="auto"
-rdma=""
-pvrdma=""
+rdma="$default_feature"
+pvrdma="$default_feature"
 gprof="no"
 debug_tcg="no"
 debug="no"
 sanitizers="no"
 tsan="no"
-fortify_source=""
+fortify_source="$default_feature"
 strip_opt="yes"
 tcg_interpreter="no"
 bigendian="no"
 mingw32="no"
 gcov="no"
-EXESUF=""
+EXESUF="$default_feature"
 HOST_DSOSUF=".so"
 modules="no"
 module_upgrades="no"
@@ -370,81 +382,81 @@ pie=""
 qom_cast_debug="yes"
 trace_backends="log"
 trace_file="trace"
-spice=""
-rbd=""
-smartcard=""
+spice="$default_feature"
+rbd="$default_feature"
+smartcard="$default_feature"
 u2f="auto"
-libusb=""
-usb_redir=""
-opengl=""
+libusb="$default_feature"
+usb_redir="$default_feature"
+opengl="$default_feature"
 opengl_dmabuf="no"
 cpuid_h="no"
-avx2_opt=""
+avx2_opt="$default_feature"
 capstone="auto"
-lzo=""
-snappy=""
-bzip2=""
-lzfse=""
-zstd=""
-guest_agent=""
+lzo="$default_feature"
+snappy="$default_feature"
+bzip2="$default_feature"
+lzfse="$default_feature"
+zstd="$default_feature"
+guest_agent="$default_feature"
 guest_agent_with_vss="no"
 guest_agent_ntddscsi="no"
-guest_agent_msi=""
-vss_win32_sdk=""
+guest_agent_msi="$default_feature"
+vss_win32_sdk="$default_feature"
 win_sdk="no"
-want_tools=""
-libiscsi=""
-libnfs=""
+want_tools="$default_feature"
+libiscsi="$default_feature"
+libnfs="$default_feature"
 coroutine=""
-coroutine_pool=""
+coroutine_pool="$default_feature"
 debug_stack_usage="no"
 crypto_afalg="no"
-seccomp=""
-glusterfs=""
+seccomp="$default_feature"
+glusterfs="$default_feature"
 glusterfs_xlator_opt="no"
 glusterfs_discard="no"
 glusterfs_fallocate="no"
 glusterfs_zerofill="no"
 glusterfs_ftruncate_has_stat="no"
 glusterfs_iocb_has_stat="no"
-gtk=""
+gtk="$default_feature"
 gtk_gl="no"
 tls_priority="NORMAL"
-gnutls=""
-nettle=""
+gnutls="$default_feature"
+nettle="$default_feature"
 nettle_xts="no"
-gcrypt=""
+gcrypt="$default_feature"
 gcrypt_hmac="no"
 gcrypt_xts="no"
 qemu_private_xts="yes"
-auth_pam=""
-vte=""
-virglrenderer=""
-tpm=""
-libssh=""
-live_block_migration="yes"
-numa=""
+auth_pam="$default_feature"
+vte="$default_feature"
+virglrenderer="$default_feature"
+tpm="$default_feature"
+libssh="$default_feature"
+live_block_migration=${default_feature:-yes}
+numa="$default_feature"
 tcmalloc="no"
 jemalloc="no"
-replication="yes"
-bochs="yes"
-cloop="yes"
-dmg="yes"
-qcow1="yes"
-vdi="yes"
-vvfat="yes"
-qed="yes"
-parallels="yes"
+replication=${default_feature:-yes}
+bochs=${default_feature:-yes}
+cloop=${default_feature:-yes}
+dmg=${default_feature:-yes}
+qcow1=${default_feature:-yes}
+vdi=${default_feature:-yes}
+vvfat=${default_feature:-yes}
+qed=${default_feature:-yes}
+parallels=${default_feature:-yes}
 sheepdog="no"
-libxml2=""
+libxml2="$default_feature"
 debug_mutex="no"
-libpmem=""
+libpmem="$default_feature"
 default_devices="yes"
 plugins="no"
 fuzzing="no"
 rng_none="no"
-secret_keyring=""
-libdaxctl=""
+secret_keyring="$default_feature"
+libdaxctl="$default_feature"
 meson=""
 ninja=""
 skip_meson=no
@@ -453,7 +465,7 @@ gettext="auto"
 bogus_os="no"
 malloc_trim="auto"
 
-# parse CC options first
+# parse CC options second
 for opt do
   optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
   case "$opt" in
@@ -796,7 +808,7 @@ Linux)
   audio_possible_drivers="oss alsa sdl pa"
   linux="yes"
   linux_user="yes"
-  vhost_user="yes"
+  vhost_user=${default_feature:-yes}
 ;;
 esac
 
@@ -940,6 +952,8 @@ for opt do
   ;;
   --without-default-devices) default_devices="no"
   ;;
+  --without-default-features) # processed above
+  ;;
   --enable-gprof) gprof="yes"
   ;;
   --enable-gcov) gcov="yes"
@@ -1737,7 +1751,8 @@ Advanced options (experts only):
   --gdb=GDB-path           gdb to use for gdbstub tests [$gdb_bin]
 
 Optional features, enabled with --enable-FEATURE and
-disabled with --disable-FEATURE, default is enabled if available:
+disabled with --disable-FEATURE, default is enabled if available
+(unless built with --without-default-features):
 
   system          all system emulation targets
   user            supported user emulation targets
@@ -7001,6 +7016,7 @@ NINJA=$ninja $meson setup \
         -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
         -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
         -Dvhost_user_blk_server=$vhost_user_blk_server \
+        $(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \
         $cross_arg \
         "$PWD" "$source_path"
 
-- 
2.20.1

[PATCH v2 5/8] python: add __repr__ to ConsoleSocket to aid debugging

[Alex Bennée]

While attempting to debug some console weirdness I thought it would be
worth making it easier to see what it had inside.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>

---
v2
  - make more pythonic
---
 python/qemu/console_socket.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py
index f060d79e06..ac21130e44 100644
--- a/python/qemu/console_socket.py
+++ b/python/qemu/console_socket.py
@@ -45,6 +45,13 @@ class ConsoleSocket(socket.socket):
         if drain:
             self._drain_thread = self._thread_start()
 
+    def __repr__(self) -> str:
+        s = super().__repr__()
+        s = s.rstrip(">")
+        s = "%s,  logfile=%s, drain_thread=%s>" % (s, self._logfile,
+                                                   self._drain_thread)
+        return s
+
     def _drain_fn(self) -> None:
         """Drains the socket and runs while the socket is open."""
         while self._open:
-- 
2.20.1

[PATCH v2 6/8] gitlab: move --without-default-devices build from Travis

[Alex Bennée]

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - move to centos8
---
 .gitlab-ci.yml | 7 +++++++
 .travis.yml    | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3bcaacf7b..2134453717 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -514,6 +514,13 @@ build-trace-ust-system:
     IMAGE: ubuntu2004
     CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu
 
+# Check our reduced build configurations
+build-without-default-devices:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: centos8
+    CONFIGURE_ARGS: --without-default-devices --disable-user
+
 check-patch:
   stage: build
   image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
diff --git a/.travis.yml b/.travis.yml
index d01714a5ae..f2a101936c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -205,14 +205,6 @@ jobs:
         - ${SRC_DIR}/scripts/travis/coverage-summary.sh
 
 
-    # We manually include builds which we disable "make check" for
-    - name: "GCC without-default-devices (softmmu)"
-      env:
-        - CONFIG="--without-default-devices --disable-user"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-        - TEST_CMD=""
-
-
     # Using newer GCC with sanitizers
     - name: "GCC9 with sanitizers (softmmu)"
       dist: bionic
-- 
2.20.1

[PATCH v2 7/8] gitlab: add --without-default-features build

[Alex Bennée]

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - swap with centos8, don't include --without-default-devuces
---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2134453717..229545bc03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -521,6 +521,13 @@ build-without-default-devices:
     IMAGE: centos8
     CONFIGURE_ARGS: --without-default-devices --disable-user
 
+build-without-default-features:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: debian-amd64
+    CONFIGURE_ARGS: --without-default-features --disable-user
+    MAKE_CHECK_ARGS: check-unit
+
 check-patch:
   stage: build
   image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
-- 
2.20.1

[PATCH v2 8/8] tests/tcg: build tests with -Werror

[Alex Bennée]

Hopefully this will guard against sloppy code getting into our tests.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/tcg/Makefile.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index 2ae86776cd..24d75a5801 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -94,7 +94,7 @@ ifdef CONFIG_USER_ONLY
 -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target
 
 # Add the common build options
-CFLAGS+=-Wall -O0 -g -fno-strict-aliasing
+CFLAGS+=-Wall -Werror -O0 -g -fno-strict-aliasing
 ifeq ($(BUILD_STATIC),y)
 LDFLAGS+=-static
 endif
-- 
2.20.1

Re: [PATCH v2 8/8] tests/tcg: build tests with -Werror

[Philippe Mathieu-Daudé]

On 12/10/20 8:04 PM, Alex Bennée wrote:
> Hopefully this will guard against sloppy code getting into our tests.
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/tcg/Makefile.target | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH v2 2/8] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build

[Thomas Huth]

On 10/12/2020 20.04, Alex Bennée wrote:
> Otherwise we miss coverage of KVM support in the cross build. To
> balance it out add arm-softmmu (no kvm, subset of aarch64),
> cris-softmmu and ppc-softmmu to the exclude list which do get coverage
> elsewhere.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  .gitlab-ci.d/crossbuilds.yml | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> index bd6473a75a..fcc1b95290 100644
> --- a/.gitlab-ci.d/crossbuilds.yml
> +++ b/.gitlab-ci.d/crossbuilds.yml
> @@ -7,9 +7,9 @@
>      - cd build
>      - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
>        ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user
> -        --target-list-exclude="aarch64-softmmu i386-softmmu microblaze-softmmu
> -          mips-softmmu mipsel-softmmu mips64-softmmu ppc64-softmmu sh4-softmmu
> -          xtensa-softmmu"
> +        --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu
> +          microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu
> +          ppc-softmmu sh4-softmmu xtensa-softmmu"
>      - make -j$(expr $(nproc) + 1) all check-build

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

Re: [PATCH v2 6/8] gitlab: move --without-default-devices build from Travis

[Thomas Huth]

On 10/12/2020 20.04, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> ---
> v2
>   - move to centos8
> ---
>  .gitlab-ci.yml | 7 +++++++
>  .travis.yml    | 8 --------
>  2 files changed, 7 insertions(+), 8 deletions(-)

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

Re: [PATCH v2 7/8] gitlab: add --without-default-features build

[Thomas Huth]

On 10/12/2020 20.04, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> ---
> v2
>   - swap with centos8, don't include --without-default-devuces
> ---
>  .gitlab-ci.yml | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 2134453717..229545bc03 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -521,6 +521,13 @@ build-without-default-devices:
>      IMAGE: centos8
>      CONFIGURE_ARGS: --without-default-devices --disable-user
>  
> +build-without-default-features:
> +  <<: *native_build_job_definition
> +  variables:
> +    IMAGE: debian-amd64
> +    CONFIGURE_ARGS: --without-default-features --disable-user
> +    MAKE_CHECK_ARGS: check-unit
> +
>  check-patch:
>    stage: build
>    image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
> 

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

Re: [PATCH v2 1/8] configure: include moxie-softmmu in deprecated_targets_list

[Thomas Huth]

On 10/12/2020 20.04, Alex Bennée wrote:
> We still build it but there is no point including it in the normal
> builds as it is ushered out of the door.
> 
> Fixes: 4258c8e221 ("docs/system/deprecated: Mark the 'moxie' CPU as deprecated")
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  configure      | 2 +-
>  .gitlab-ci.yml | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index 18c26e0389..8f2095a2db 100755
> --- a/configure
> +++ b/configure
> @@ -1610,7 +1610,7 @@ if [ "$ARCH" = "unknown" ]; then
>  fi
>  
>  default_target_list=""
> -deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
> +deprecated_targets_list=moxie-softmmu,ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
>  deprecated_features=""
>  mak_wilds=""
>  
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 98bff03b47..b3bcaacf7b 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -355,7 +355,7 @@ build-deprecated:
>      IMAGE: debian-all-test-cross
>      CONFIGURE_ARGS: --disable-docs --disable-tools
>      MAKE_CHECK_ARGS: build-tcg
> -    TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
> +    TARGETS: moxie-softmmu ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
>        unicore32-softmmu
>    artifacts:
>      expire_in: 2 days
> 

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

Re: [PATCH v2 4/8] configure: add --without-default-features

[Thomas Huth]

On 10/12/2020 20.04, Alex Bennée wrote:
> By default QEMU enables a lot of features if it can probe and find the
> support libraries. It also enables a bunch of features by default.
> This patch adds the ability to build --without-default-features which
> can be paired with a --without-default-devices for a barely functional
> build.
> 
> The main use case for this is testing our build assumptions and for
> minimising the amount of stuff you build if you just want to test a
> particular feature on your relatively slow emulated test system.

This will likely also be very helpful for downstream distros like RHEL where
we also only want to enable a well-known set of supported features and
disable everything else by default. Thanks for tackling this!

...
> diff --git a/configure b/configure
> index 46fdea88c7..11f5878a59 100755
> --- a/configure
> +++ b/configure
> @@ -291,10 +291,22 @@ unset target_list_exclude
>  #
>  # Always add --enable-foo and --disable-foo command line args.
>  # Distributions want to ensure that several features are compiled in, and it
> -# is impossible without a --enable-foo that exits if a feature is not found.
> +# is impossible without a --enable-foo that exits if a feature is not
> +# found.

Why did you wrap the second long line, but not the first one?

> -brlapi=""
> -curl=""
> +default_feature=""
> +# parse CC options second
> +for opt do
> +  optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
> +  case "$opt" in
> +      --without-default-features)
> +          default_feature="no"
> +  ;;
> +  esac
> +done
> +
> +brlapi="$default_feature"
> +curl="$default_feature"
>  iconv="auto"
>  curses="auto"
>  docs="auto"
> @@ -303,52 +315,52 @@ netmap="no"
>  sdl="auto"
>  sdl_image="auto"
>  virtiofsd="auto"
> -virtfs=""
> +virtfs="$default_feature"

So this currently only deals with the variables that are pre-initialized to
"" ... but what about those that are initialized to "auto" ? I think they
should be handled, too? Well, it can still be done in a later patch, I guess.

Acked-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 8/8] tests/tcg: build tests with -Werror

[Thomas Huth]

On 10/12/2020 20.04, Alex Bennée wrote:
> Hopefully this will guard against sloppy code getting into our tests.
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/tcg/Makefile.target | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
> index 2ae86776cd..24d75a5801 100644
> --- a/tests/tcg/Makefile.target
> +++ b/tests/tcg/Makefile.target
> @@ -94,7 +94,7 @@ ifdef CONFIG_USER_ONLY
>  -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target
>  
>  # Add the common build options
> -CFLAGS+=-Wall -O0 -g -fno-strict-aliasing
> +CFLAGS+=-Wall -Werror -O0 -g -fno-strict-aliasing
>  ifeq ($(BUILD_STATIC),y)
>  LDFLAGS+=-static
>  endif

I hope this works out as expected ... -Werror together with -O0 hopefully
does not trigger any false-positives since the compiler might not smart
enough in this case to determine e.g. whether certain variables are used or
not? Well, let's try and see.

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

Re: [PATCH v2 4/8] configure: add --without-default-features

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> On 10/12/2020 20.04, Alex Bennée wrote:
>> By default QEMU enables a lot of features if it can probe and find the
>> support libraries. It also enables a bunch of features by default.
>> This patch adds the ability to build --without-default-features which
>> can be paired with a --without-default-devices for a barely functional
>> build.
>> 
<snip>
>> -# is impossible without a --enable-foo that exits if a feature is not found.
>> +# is impossible without a --enable-foo that exits if a feature is not
>> +# found.
>
> Why did you wrap the second long line, but not the first one?

Hmm I probably just hit return on that line and my editor wrapped it.
Revert or reflow?

>
>> -brlapi=""
>> -curl=""
>> +default_feature=""
>> +# parse CC options second
>> +for opt do
>> +  optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
>> +  case "$opt" in
>> +      --without-default-features)
>> +          default_feature="no"
>> +  ;;
>> +  esac
>> +done
>> +
>> +brlapi="$default_feature"
>> +curl="$default_feature"
>>  iconv="auto"
>>  curses="auto"
>>  docs="auto"
>> @@ -303,52 +315,52 @@ netmap="no"
>>  sdl="auto"
>>  sdl_image="auto"
>>  virtiofsd="auto"
>> -virtfs=""
>> +virtfs="$default_feature"
>
> So this currently only deals with the variables that are pre-initialized to
> "" ... but what about those that are initialized to "auto" ? I think they
> should be handled, too? Well, it can still be done in a later patch, I
> guess.

Most of the auto flags go through to meson which can then squash them
with the -Dauto_features=disabled, but I can fixup the auto's left in
configure with additional patches.

>
> Acked-by: Thomas Huth <thuth@redhat.com>


-- 
Alex Bennée

Re: [PATCH v2 1/8] configure: include moxie-softmmu in deprecated_targets_list

[Wainer dos Santos Moschetta]

On 12/10/20 4:04 PM, Alex Bennée wrote:
> We still build it but there is no point including it in the normal
> builds as it is ushered out of the door.
>
> Fixes: 4258c8e221 ("docs/system/deprecated: Mark the 'moxie' CPU as deprecated")
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   configure      | 2 +-
>   .gitlab-ci.yml | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

>
> diff --git a/configure b/configure
> index 18c26e0389..8f2095a2db 100755
> --- a/configure
> +++ b/configure
> @@ -1610,7 +1610,7 @@ if [ "$ARCH" = "unknown" ]; then
>   fi
>   
>   default_target_list=""
> -deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
> +deprecated_targets_list=moxie-softmmu,ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
>   deprecated_features=""
>   mak_wilds=""
>   
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 98bff03b47..b3bcaacf7b 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -355,7 +355,7 @@ build-deprecated:
>       IMAGE: debian-all-test-cross
>       CONFIGURE_ARGS: --disable-docs --disable-tools
>       MAKE_CHECK_ARGS: build-tcg
> -    TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
> +    TARGETS: moxie-softmmu ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
>         unicore32-softmmu
>     artifacts:
>       expire_in: 2 days

Re: [PATCH v2 2/8] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build

[Wainer dos Santos Moschetta]

On 12/10/20 4:04 PM, Alex Bennée wrote:
> Otherwise we miss coverage of KVM support in the cross build. To
> balance it out add arm-softmmu (no kvm, subset of aarch64),
> cris-softmmu and ppc-softmmu to the exclude list which do get coverage
> elsewhere.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/crossbuilds.yml | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

>
> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> index bd6473a75a..fcc1b95290 100644
> --- a/.gitlab-ci.d/crossbuilds.yml
> +++ b/.gitlab-ci.d/crossbuilds.yml
> @@ -7,9 +7,9 @@
>       - cd build
>       - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
>         ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user
> -        --target-list-exclude="aarch64-softmmu i386-softmmu microblaze-softmmu
> -          mips-softmmu mipsel-softmmu mips64-softmmu ppc64-softmmu sh4-softmmu
> -          xtensa-softmmu"
> +        --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu
> +          microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu
> +          ppc-softmmu sh4-softmmu xtensa-softmmu"
>       - make -j$(expr $(nproc) + 1) all check-build
>   
>   # Job to cross-build specific accelerators.

Re: [PATCH v2 6/8] gitlab: move --without-default-devices build from Travis

[Wainer dos Santos Moschetta]

Hi,

On 12/10/20 4:04 PM, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> ---
> v2
>    - move to centos8
> ---
>   .gitlab-ci.yml | 7 +++++++
>   .travis.yml    | 8 --------
>   2 files changed, 7 insertions(+), 8 deletions(-)

lgtm.

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index b3bcaacf7b..2134453717 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -514,6 +514,13 @@ build-trace-ust-system:
>       IMAGE: ubuntu2004
>       CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu
>   
> +# Check our reduced build configurations
> +build-without-default-devices:
> +  <<: *native_build_job_definition
> +  variables:
> +    IMAGE: centos8
> +    CONFIGURE_ARGS: --without-default-devices --disable-user
> +
>   check-patch:
>     stage: build
>     image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
> diff --git a/.travis.yml b/.travis.yml
> index d01714a5ae..f2a101936c 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -205,14 +205,6 @@ jobs:
>           - ${SRC_DIR}/scripts/travis/coverage-summary.sh
>   
>   
> -    # We manually include builds which we disable "make check" for
> -    - name: "GCC without-default-devices (softmmu)"
> -      env:
> -        - CONFIG="--without-default-devices --disable-user"
> -        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
> -        - TEST_CMD=""
> -
> -
>       # Using newer GCC with sanitizers
>       - name: "GCC9 with sanitizers (softmmu)"
>         dist: bionic

Re: [PATCH v2 3/8] configure: move gettext detection to meson.build

[Alex Bennée]

Alex Bennée <alex.bennee@linaro.org> writes:

> This will allow meson to honour -Dauto_features=disabled later.
>
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

ping Paolo, are you happy with this bit?

> ---
>  configure         | 19 +++----------------
>  meson_options.txt |  2 +-
>  po/meson.build    |  2 +-
>  3 files changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/configure b/configure
> index 8f2095a2db..46fdea88c7 100755
> --- a/configure
> +++ b/configure
> @@ -448,7 +448,7 @@ libdaxctl=""
>  meson=""
>  ninja=""
>  skip_meson=no
> -gettext=""
> +gettext="auto"
>  
>  bogus_os="no"
>  malloc_trim="auto"
> @@ -1014,9 +1014,9 @@ for opt do
>    ;;
>    --enable-vnc) vnc="enabled"
>    ;;
> -  --disable-gettext) gettext="false"
> +  --disable-gettext) gettext="disabled"
>    ;;
> -  --enable-gettext) gettext="true"
> +  --enable-gettext) gettext="enabled"
>    ;;
>    --oss-lib=*) oss_lib="$optarg"
>    ;;
> @@ -2839,19 +2839,6 @@ if test "$xen_pci_passthrough" != "disabled"; then
>    fi
>  fi
>  
> -##########################################
> -# gettext probe
> -if test "$gettext" != "false" ; then
> -  if has xgettext; then
> -    gettext=true
> -  else
> -    if test "$gettext" = "true" ; then
> -      feature_not_found "gettext" "Install xgettext binary"
> -    fi
> -    gettext=false
> -  fi
> -fi
> -
>  ##########################################
>  # X11 probe
>  if $pkg_config --exists "x11"; then
> diff --git a/meson_options.txt b/meson_options.txt
> index f6f64785fe..191e848600 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -9,7 +9,7 @@ option('sphinx_build', type : 'string', value : '',
>  
>  option('docs', type : 'feature', value : 'auto',
>         description: 'Documentations build support')
> -option('gettext', type : 'boolean', value : true,
> +option('gettext', type : 'feature', value : 'auto',
>         description: 'Localization of the GTK+ user interface')
>  option('install_blobs', type : 'boolean', value : true,
>         description: 'install provided firmware blobs')
> diff --git a/po/meson.build b/po/meson.build
> index 1387fd979a..a863f0575f 100644
> --- a/po/meson.build
> +++ b/po/meson.build
> @@ -1,6 +1,6 @@
>  i18n = import('i18n')
>  
> -if get_option('gettext')
> +if find_program('xgettext', required: get_option('gettext')).found()
>    i18n.gettext(meson.project_name(),
>                 args: '--msgid-bugs-address=qemu-devel@nongnu.org',
>                 preset: 'glib')


-- 
Alex Bennée

Re: [PATCH v2 3/8] configure: move gettext detection to meson.build

[Paolo Bonzini]

On 16/12/20 15:19, Alex Bennée wrote:
> 
> Alex Bennée <alex.bennee@linaro.org> writes:
> 
>> This will allow meson to honour -Dauto_features=disabled later.
>>
>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> ping Paolo, are you happy with this bit?

Yes, I'm so happy with this and the --with-default-features parts that I 
was going to include it in my next pull request. :)

Series

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

>> ---
>>   configure         | 19 +++----------------
>>   meson_options.txt |  2 +-
>>   po/meson.build    |  2 +-
>>   3 files changed, 5 insertions(+), 18 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 8f2095a2db..46fdea88c7 100755
>> --- a/configure
>> +++ b/configure
>> @@ -448,7 +448,7 @@ libdaxctl=""
>>   meson=""
>>   ninja=""
>>   skip_meson=no
>> -gettext=""
>> +gettext="auto"
>>   
>>   bogus_os="no"
>>   malloc_trim="auto"
>> @@ -1014,9 +1014,9 @@ for opt do
>>     ;;
>>     --enable-vnc) vnc="enabled"
>>     ;;
>> -  --disable-gettext) gettext="false"
>> +  --disable-gettext) gettext="disabled"
>>     ;;
>> -  --enable-gettext) gettext="true"
>> +  --enable-gettext) gettext="enabled"
>>     ;;
>>     --oss-lib=*) oss_lib="$optarg"
>>     ;;
>> @@ -2839,19 +2839,6 @@ if test "$xen_pci_passthrough" != "disabled"; then
>>     fi
>>   fi
>>   
>> -##########################################
>> -# gettext probe
>> -if test "$gettext" != "false" ; then
>> -  if has xgettext; then
>> -    gettext=true
>> -  else
>> -    if test "$gettext" = "true" ; then
>> -      feature_not_found "gettext" "Install xgettext binary"
>> -    fi
>> -    gettext=false
>> -  fi
>> -fi
>> -
>>   ##########################################
>>   # X11 probe
>>   if $pkg_config --exists "x11"; then
>> diff --git a/meson_options.txt b/meson_options.txt
>> index f6f64785fe..191e848600 100644
>> --- a/meson_options.txt
>> +++ b/meson_options.txt
>> @@ -9,7 +9,7 @@ option('sphinx_build', type : 'string', value : '',
>>   
>>   option('docs', type : 'feature', value : 'auto',
>>          description: 'Documentations build support')
>> -option('gettext', type : 'boolean', value : true,
>> +option('gettext', type : 'feature', value : 'auto',
>>          description: 'Localization of the GTK+ user interface')
>>   option('install_blobs', type : 'boolean', value : true,
>>          description: 'install provided firmware blobs')
>> diff --git a/po/meson.build b/po/meson.build
>> index 1387fd979a..a863f0575f 100644
>> --- a/po/meson.build
>> +++ b/po/meson.build
>> @@ -1,6 +1,6 @@
>>   i18n = import('i18n')
>>   
>> -if get_option('gettext')
>> +if find_program('xgettext', required: get_option('gettext')).found()
>>     i18n.gettext(meson.project_name(),
>>                  args: '--msgid-bugs-address=qemu-devel@nongnu.org',
>>                  preset: 'glib')
> 
> 

Re: [PATCH v2 3/8] configure: move gettext detection to meson.build

[Alex Bennée]

Paolo Bonzini <pbonzini@redhat.com> writes:

> On 16/12/20 15:19, Alex Bennée wrote:
>> 
>> Alex Bennée <alex.bennee@linaro.org> writes:
>> 
>>> This will allow meson to honour -Dauto_features=disabled later.
>>>
>>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> 
>> ping Paolo, are you happy with this bit?
>
> Yes, I'm so happy with this and the --with-default-features parts that I 
> was going to include it in my next pull request. :)

I'm putting together an testing one now (as there is a testing update as
well).

>
> Series
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>
> Paolo
>
>>> ---
>>>   configure         | 19 +++----------------
>>>   meson_options.txt |  2 +-
>>>   po/meson.build    |  2 +-
>>>   3 files changed, 5 insertions(+), 18 deletions(-)
>>>
>>> diff --git a/configure b/configure
>>> index 8f2095a2db..46fdea88c7 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -448,7 +448,7 @@ libdaxctl=""
>>>   meson=""
>>>   ninja=""
>>>   skip_meson=no
>>> -gettext=""
>>> +gettext="auto"
>>>   
>>>   bogus_os="no"
>>>   malloc_trim="auto"
>>> @@ -1014,9 +1014,9 @@ for opt do
>>>     ;;
>>>     --enable-vnc) vnc="enabled"
>>>     ;;
>>> -  --disable-gettext) gettext="false"
>>> +  --disable-gettext) gettext="disabled"
>>>     ;;
>>> -  --enable-gettext) gettext="true"
>>> +  --enable-gettext) gettext="enabled"
>>>     ;;
>>>     --oss-lib=*) oss_lib="$optarg"
>>>     ;;
>>> @@ -2839,19 +2839,6 @@ if test "$xen_pci_passthrough" != "disabled"; then
>>>     fi
>>>   fi
>>>   
>>> -##########################################
>>> -# gettext probe
>>> -if test "$gettext" != "false" ; then
>>> -  if has xgettext; then
>>> -    gettext=true
>>> -  else
>>> -    if test "$gettext" = "true" ; then
>>> -      feature_not_found "gettext" "Install xgettext binary"
>>> -    fi
>>> -    gettext=false
>>> -  fi
>>> -fi
>>> -
>>>   ##########################################
>>>   # X11 probe
>>>   if $pkg_config --exists "x11"; then
>>> diff --git a/meson_options.txt b/meson_options.txt
>>> index f6f64785fe..191e848600 100644
>>> --- a/meson_options.txt
>>> +++ b/meson_options.txt
>>> @@ -9,7 +9,7 @@ option('sphinx_build', type : 'string', value : '',
>>>   
>>>   option('docs', type : 'feature', value : 'auto',
>>>          description: 'Documentations build support')
>>> -option('gettext', type : 'boolean', value : true,
>>> +option('gettext', type : 'feature', value : 'auto',
>>>          description: 'Localization of the GTK+ user interface')
>>>   option('install_blobs', type : 'boolean', value : true,
>>>          description: 'install provided firmware blobs')
>>> diff --git a/po/meson.build b/po/meson.build
>>> index 1387fd979a..a863f0575f 100644
>>> --- a/po/meson.build
>>> +++ b/po/meson.build
>>> @@ -1,6 +1,6 @@
>>>   i18n = import('i18n')
>>>   
>>> -if get_option('gettext')
>>> +if find_program('xgettext', required: get_option('gettext')).found()
>>>     i18n.gettext(meson.project_name(),
>>>                  args: '--msgid-bugs-address=qemu-devel@nongnu.org',
>>>                  preset: 'glib')
>> 
>> 


-- 
Alex Bennée

Re: [PATCH v2 3/8] configure: move gettext detection to meson.build

[Paolo Bonzini]

On 16/12/20 16:27, Alex Bennée wrote:
> 
> Paolo Bonzini <pbonzini@redhat.com> writes:
> 
>> On 16/12/20 15:19, Alex Bennée wrote:
>>>
>>> Alex Bennée <alex.bennee@linaro.org> writes:
>>>
>>>> This will allow meson to honour -Dauto_features=disabled later.
>>>>
>>>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>>
>>> ping Paolo, are you happy with this bit?
>>
>> Yes, I'm so happy with this and the --with-default-features parts that I
>> was going to include it in my next pull request. :)
> 
> I'm putting together an testing one now (as there is a testing update as
> well).

Great, I'll rebase when it hits qemu.git.

Paolo

>>
>> Series
>>
>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>>
>> Paolo
>>
>>>> ---
>>>>    configure         | 19 +++----------------
>>>>    meson_options.txt |  2 +-
>>>>    po/meson.build    |  2 +-
>>>>    3 files changed, 5 insertions(+), 18 deletions(-)
>>>>
>>>> diff --git a/configure b/configure
>>>> index 8f2095a2db..46fdea88c7 100755
>>>> --- a/configure
>>>> +++ b/configure
>>>> @@ -448,7 +448,7 @@ libdaxctl=""
>>>>    meson=""
>>>>    ninja=""
>>>>    skip_meson=no
>>>> -gettext=""
>>>> +gettext="auto"
>>>>    
>>>>    bogus_os="no"
>>>>    malloc_trim="auto"
>>>> @@ -1014,9 +1014,9 @@ for opt do
>>>>      ;;
>>>>      --enable-vnc) vnc="enabled"
>>>>      ;;
>>>> -  --disable-gettext) gettext="false"
>>>> +  --disable-gettext) gettext="disabled"
>>>>      ;;
>>>> -  --enable-gettext) gettext="true"
>>>> +  --enable-gettext) gettext="enabled"
>>>>      ;;
>>>>      --oss-lib=*) oss_lib="$optarg"
>>>>      ;;
>>>> @@ -2839,19 +2839,6 @@ if test "$xen_pci_passthrough" != "disabled"; then
>>>>      fi
>>>>    fi
>>>>    
>>>> -##########################################
>>>> -# gettext probe
>>>> -if test "$gettext" != "false" ; then
>>>> -  if has xgettext; then
>>>> -    gettext=true
>>>> -  else
>>>> -    if test "$gettext" = "true" ; then
>>>> -      feature_not_found "gettext" "Install xgettext binary"
>>>> -    fi
>>>> -    gettext=false
>>>> -  fi
>>>> -fi
>>>> -
>>>>    ##########################################
>>>>    # X11 probe
>>>>    if $pkg_config --exists "x11"; then
>>>> diff --git a/meson_options.txt b/meson_options.txt
>>>> index f6f64785fe..191e848600 100644
>>>> --- a/meson_options.txt
>>>> +++ b/meson_options.txt
>>>> @@ -9,7 +9,7 @@ option('sphinx_build', type : 'string', value : '',
>>>>    
>>>>    option('docs', type : 'feature', value : 'auto',
>>>>           description: 'Documentations build support')
>>>> -option('gettext', type : 'boolean', value : true,
>>>> +option('gettext', type : 'feature', value : 'auto',
>>>>           description: 'Localization of the GTK+ user interface')
>>>>    option('install_blobs', type : 'boolean', value : true,
>>>>           description: 'install provided firmware blobs')
>>>> diff --git a/po/meson.build b/po/meson.build
>>>> index 1387fd979a..a863f0575f 100644
>>>> --- a/po/meson.build
>>>> +++ b/po/meson.build
>>>> @@ -1,6 +1,6 @@
>>>>    i18n = import('i18n')
>>>>    
>>>> -if get_option('gettext')
>>>> +if find_program('xgettext', required: get_option('gettext')).found()
>>>>      i18n.gettext(meson.project_name(),
>>>>                   args: '--msgid-bugs-address=qemu-devel@nongnu.org',
>>>>                   preset: 'glib')
>>>
>>>
> 
>