* [PATCH v2 1/8] meson: Summarize information related to directories first
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 2/8] meson: Display host binaries information altogether Philippe Mathieu-Daudé
` (7 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 8f5a8b997d3..a47c5f8ab9d 100644
--- a/meson.build
+++ b/meson.build
@@ -2282,6 +2282,7 @@
# Configuration summary #
#########################
+# Directories
summary_info = {}
summary_info += {'Install prefix': get_option('prefix')}
summary_info += {'BIOS directory': qemu_datadir}
@@ -2301,8 +2302,11 @@
summary_info += {'Doc directory': get_option('docdir')}
summary_info += {'Build directory': meson.current_build_dir()}
summary_info += {'Source path': meson.current_source_dir()}
-summary_info += {'GIT binary': config_host['GIT']}
summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
+summary(summary_info, bool_yn: true, section: 'Directories')
+
+summary_info = {}
+summary_info += {'GIT binary': config_host['GIT']}
summary_info += {'C compiler': meson.get_compiler('c').cmd_array()[0]}
summary_info += {'Host C compiler': meson.get_compiler('c', native: true).cmd_array()[0]}
if link_language == 'cpp'
@@ -2510,7 +2514,7 @@
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary_info += {'FUSE exports': fuse.found()}
summary_info += {'FUSE lseek': fuse_lseek.found()}
-summary(summary_info, bool_yn: true)
+summary(summary_info, bool_yn: true, section: 'Misc')
if not supported_cpus.contains(cpu)
message()
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 2/8] meson: Display host binaries information altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 1/8] meson: Summarize information related to directories first Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 3/8] meson: Summarize overall features altogether Philippe Mathieu-Daudé
` (6 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/meson.build b/meson.build
index a47c5f8ab9d..614eef82c37 100644
--- a/meson.build
+++ b/meson.build
@@ -2305,8 +2305,22 @@
summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
summary(summary_info, bool_yn: true, section: 'Directories')
+# Host binaries
+summary_info = {}
+summary_info += {'git': config_host['GIT']}
+summary_info += {'make': config_host['MAKE']}
+summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())}
+summary_info += {'sphinx-build': sphinx_build.found()}
+if config_host.has_key('HAVE_GDB_BIN')
+ summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
+endif
+summary_info += {'genisoimage': config_host['GENISOIMAGE']}
+if slirp_opt != 'disabled'
+ summary_info += {'smbd': config_host['CONFIG_SMBD_COMMAND']}
+endif
+summary(summary_info, bool_yn: true, section: 'Host binaries')
+
summary_info = {}
-summary_info += {'GIT binary': config_host['GIT']}
summary_info += {'C compiler': meson.get_compiler('c').cmd_array()[0]}
summary_info += {'Host C compiler': meson.get_compiler('c', native: true).cmd_array()[0]}
if link_language == 'cpp'
@@ -2332,15 +2346,8 @@
endif
summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']}
summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']}
-summary_info += {'make': config_host['MAKE']}
-summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())}
-summary_info += {'sphinx-build': sphinx_build.found()}
-summary_info += {'genisoimage': config_host['GENISOIMAGE']}
# TODO: add back version
summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
-if slirp_opt != 'disabled'
- summary_info += {'smbd': config_host['CONFIG_SMBD_COMMAND']}
-endif
summary_info += {'module support': config_host.has_key('CONFIG_MODULES')}
if config_host.has_key('CONFIG_MODULES')
summary_info += {'alternative module path': config_host.has_key('CONFIG_MODULE_UPGRADES')}
@@ -2506,9 +2513,6 @@
summary_info += {'default devices': get_option('default_devices')}
summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')}
summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')}
-if config_host.has_key('HAVE_GDB_BIN')
- summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
-endif
summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 3/8] meson: Summarize overall features altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 1/8] meson: Summarize information related to directories first Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 2/8] meson: Display host binaries information altogether Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 4/8] meson: Summarize compilation-related information altogether Philippe Mathieu-Daudé
` (5 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Stefan Hajnoczi
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefan Hajnoczi <stefanha@redhat.com>
---
meson.build | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/meson.build b/meson.build
index 614eef82c37..4b600315ba4 100644
--- a/meson.build
+++ b/meson.build
@@ -2320,6 +2320,27 @@
endif
summary(summary_info, bool_yn: true, section: 'Host binaries')
+# Overall features
+summary_info = {}
+summary_info += {'Documentation': build_docs}
+summary_info += {'Install blobs': get_option('install_blobs')}
+# TODO: add back version
+summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
+summary_info += {'module support': config_host.has_key('CONFIG_MODULES')}
+if config_host.has_key('CONFIG_MODULES')
+ summary_info += {'alternative module path': config_host.has_key('CONFIG_MODULE_UPGRADES')}
+endif
+summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')}
+summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')}
+if have_system
+ summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
+endif
+summary_info += {'Trace backends': config_host['TRACE_BACKENDS']}
+if config_host['TRACE_BACKENDS'].split().contains('simple')
+ summary_info += {'Trace output file': config_host['CONFIG_TRACE_FILE'] + '-<pid>'}
+endif
+summary(summary_info, bool_yn: true, section: 'Overall')
+
summary_info = {}
summary_info += {'C compiler': meson.get_compiler('c').cmd_array()[0]}
summary_info += {'Host C compiler': meson.get_compiler('c', native: true).cmd_array()[0]}
@@ -2347,11 +2368,6 @@
summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']}
summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']}
# TODO: add back version
-summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
-summary_info += {'module support': config_host.has_key('CONFIG_MODULES')}
-if config_host.has_key('CONFIG_MODULES')
- summary_info += {'alternative module path': config_host.has_key('CONFIG_MODULE_UPGRADES')}
-endif
summary_info += {'host CPU': cpu}
summary_info += {'host endianness': build_machine.endian()}
summary_info += {'target list': ' '.join(target_dirs)}
@@ -2393,7 +2409,6 @@
summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
summary_info += {'curl support': curl.found()}
summary_info += {'mingw32 support': targetos == 'windows'}
-summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
summary_info += {'VirtFS support': have_virtfs}
@@ -2410,14 +2425,12 @@
summary_info += {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INTERFACE_VERSION']}
endif
summary_info += {'brlapi support': brlapi.found()}
-summary_info += {'Documentation': build_docs}
summary_info += {'PIE': get_option('b_pie')}
summary_info += {'vde support': config_host.has_key('CONFIG_VDE')}
summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')}
summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
summary_info += {'Linux io_uring support': config_host.has_key('CONFIG_LINUX_IO_URING')}
summary_info += {'ATTR/XATTR support': libattr.found()}
-summary_info += {'Install blobs': get_option('install_blobs')}
summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')}
summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')}
summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')}
@@ -2447,10 +2460,6 @@
summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
-summary_info += {'Trace backends': config_host['TRACE_BACKENDS']}
-if config_host['TRACE_BACKENDS'].split().contains('simple')
- summary_info += {'Trace output file': config_host['CONFIG_TRACE_FILE'] + '-<pid>'}
-endif
# TODO: add back protocol and server version
summary_info += {'spice support': config_host.has_key('CONFIG_SPICE')}
summary_info += {'rbd support': rbd.found()}
@@ -2511,8 +2520,6 @@
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()}
summary_info += {'default devices': get_option('default_devices')}
-summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')}
-summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')}
summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 4/8] meson: Summarize compilation-related information altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-01-21 9:56 ` [PATCH v2 3/8] meson: Summarize overall features altogether Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 5/8] meson: Display accelerators and selected targets altogether Philippe Mathieu-Daudé
` (4 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 63 +++++++++++++++++++++++++++++------------------------
1 file changed, 35 insertions(+), 28 deletions(-)
diff --git a/meson.build b/meson.build
index 4b600315ba4..194b8523f77 100644
--- a/meson.build
+++ b/meson.build
@@ -2341,7 +2341,10 @@
endif
summary(summary_info, bool_yn: true, section: 'Overall')
+# Compilation information
summary_info = {}
+summary_info += {'host CPU': cpu}
+summary_info += {'host endianness': build_machine.endian()}
summary_info += {'C compiler': meson.get_compiler('c').cmd_array()[0]}
summary_info += {'Host C compiler': meson.get_compiler('c', native: true).cmd_array()[0]}
if link_language == 'cpp'
@@ -2352,6 +2355,11 @@
if targetos == 'darwin'
summary_info += {'Objective-C compiler': meson.get_compiler('objc').cmd_array()[0]}
endif
+if targetos == 'windows'
+ if 'WIN_SDK' in config_host
+ summary_info += {'Windows SDK': config_host['WIN_SDK']}
+ endif
+endif
summary_info += {'ARFLAGS': config_host['ARFLAGS']}
summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+ ['-O' + get_option('optimization')]
@@ -2367,16 +2375,36 @@
endif
summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']}
summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']}
-# TODO: add back version
-summary_info += {'host CPU': cpu}
-summary_info += {'host endianness': build_machine.endian()}
-summary_info += {'target list': ' '.join(target_dirs)}
-summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')}
-summary_info += {'sparse enabled': sparse.found()}
-summary_info += {'strip binaries': get_option('strip')}
summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')}
summary_info += {'link-time optimization (LTO)': get_option('b_lto')}
+summary_info += {'PIE': get_option('b_pie')}
summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
+summary_info += {'malloc trim support': has_malloc_trim}
+summary_info += {'membarrier': config_host.has_key('CONFIG_MEMBARRIER')}
+summary_info += {'preadv support': config_host.has_key('CONFIG_PREADV')}
+summary_info += {'fdatasync': config_host.has_key('CONFIG_FDATASYNC')}
+summary_info += {'madvise': config_host.has_key('CONFIG_MADVISE')}
+summary_info += {'posix_madvise': config_host.has_key('CONFIG_POSIX_MADVISE')}
+summary_info += {'posix_memalign': config_host.has_key('CONFIG_POSIX_MEMALIGN')}
+summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
+summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
+summary_info += {'memory allocator': get_option('malloc')}
+summary_info += {'avx2 optimization': config_host.has_key('CONFIG_AVX2_OPT')}
+summary_info += {'avx512f optimization': config_host.has_key('CONFIG_AVX512F_OPT')}
+summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')}
+summary_info += {'gcov': get_option('b_coverage')}
+summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
+summary_info += {'CFI support': get_option('cfi')}
+if get_option('cfi')
+ summary_info += {'CFI debug support': get_option('cfi_debug')}
+endif
+summary_info += {'strip binaries': get_option('strip')}
+summary_info += {'mingw32 support': targetos == 'windows'}
+summary(summary_info, bool_yn: true, section: 'Compilation')
+
+summary_info = {}
+summary_info += {'target list': ' '.join(target_dirs)}
+summary_info += {'sparse enabled': sparse.found()}
if targetos == 'darwin'
summary_info += {'Cocoa support': cocoa.found()}
endif
@@ -2408,7 +2436,6 @@
# TODO: add back version
summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
summary_info += {'curl support': curl.found()}
-summary_info += {'mingw32 support': targetos == 'windows'}
summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
summary_info += {'VirtFS support': have_virtfs}
@@ -2425,7 +2452,6 @@
summary_info += {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INTERFACE_VERSION']}
endif
summary_info += {'brlapi support': brlapi.found()}
-summary_info += {'PIE': get_option('b_pie')}
summary_info += {'vde support': config_host.has_key('CONFIG_VDE')}
summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')}
summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
@@ -2440,16 +2466,9 @@
summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')}
summary_info += {'TCG interpreter': config_host.has_key('CONFIG_TCG_INTERPRETER')}
endif
-summary_info += {'malloc trim support': has_malloc_trim}
summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt}
-summary_info += {'membarrier': config_host.has_key('CONFIG_MEMBARRIER')}
-summary_info += {'preadv support': config_host.has_key('CONFIG_PREADV')}
-summary_info += {'fdatasync': config_host.has_key('CONFIG_FDATASYNC')}
-summary_info += {'madvise': config_host.has_key('CONFIG_MADVISE')}
-summary_info += {'posix_madvise': config_host.has_key('CONFIG_POSIX_MADVISE')}
-summary_info += {'posix_memalign': config_host.has_key('CONFIG_POSIX_MEMALIGN')}
summary_info += {'libcap-ng support': libcap_ng.found()}
summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
@@ -2474,23 +2493,15 @@
summary_info += {'libnfs support': libnfs.found()}
summary_info += {'build guest agent': config_host.has_key('CONFIG_GUEST_AGENT')}
if targetos == 'windows'
- if 'WIN_SDK' in config_host
- summary_info += {'Windows SDK': config_host['WIN_SDK']}
- endif
summary_info += {'QGA VSS support': config_host.has_key('CONFIG_QGA_VSS')}
summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI')}
endif
summary_info += {'seccomp support': seccomp.found()}
-summary_info += {'CFI support': get_option('cfi')}
-summary_info += {'CFI debug support': get_option('cfi_debug')}
summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] == '1'}
-summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
-summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
summary_info += {'GlusterFS support': glusterfs.found()}
-summary_info += {'gcov': get_option('b_coverage')}
summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
summary_info += {'QOM debugging': config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
@@ -2502,9 +2513,6 @@
summary_info += {'zstd support': zstd.found()}
summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')}
-summary_info += {'memory allocator': get_option('malloc')}
-summary_info += {'avx2 optimization': config_host.has_key('CONFIG_AVX2_OPT')}
-summary_info += {'avx512f optimization': config_host.has_key('CONFIG_AVX512F_OPT')}
summary_info += {'replication support': config_host.has_key('CONFIG_REPLICATION')}
summary_info += {'bochs support': config_host.has_key('CONFIG_BOCHS')}
summary_info += {'cloop support': config_host.has_key('CONFIG_CLOOP')}
@@ -2520,7 +2528,6 @@
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()}
summary_info += {'default devices': get_option('default_devices')}
-summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary_info += {'FUSE exports': fuse.found()}
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 5/8] meson: Display accelerators and selected targets altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2021-01-21 9:56 ` [PATCH v2 4/8] meson: Summarize compilation-related information altogether Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:56 ` [RFC PATCH v2 6/8] meson: Display block layer information altogether Philippe Mathieu-Daudé
` (3 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel
Cc: Stefano Stabellini, Paul Durrant, Richard Henderson,
Cameron Esfahani, Roman Bolshakov, Anthony Perard, Paolo Bonzini,
Sunil Muthuswamy, Philippe Mathieu-Daudé
Display accelerators and selected targets altogether,
avoid to display unuseful information when not relevant.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Cameron Esfahani <dirty@apple.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Cc: Sunil Muthuswamy <sunilmut@microsoft.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Paul Durrant <paul@xen.org>
---
meson.build | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/meson.build b/meson.build
index 194b8523f77..a0945749f94 100644
--- a/meson.build
+++ b/meson.build
@@ -2323,6 +2323,8 @@
# Overall features
summary_info = {}
summary_info += {'Documentation': build_docs}
+summary_info += {'system-mode emulation': have_system}
+summary_info += {'user-mode emulation': have_user}
summary_info += {'Install blobs': get_option('install_blobs')}
# TODO: add back version
summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
@@ -2402,8 +2404,30 @@
summary_info += {'mingw32 support': targetos == 'windows'}
summary(summary_info, bool_yn: true, section: 'Compilation')
+# Targets and accelerators
summary_info = {}
+if have_system
+ summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')}
+ summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')}
+ summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')}
+ summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')}
+ summary_info += {'Xen support': config_host.has_key('CONFIG_XEN_BACKEND')}
+ if config_host.has_key('CONFIG_XEN_BACKEND')
+ summary_info += {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INTERFACE_VERSION']}
+ endif
+endif
+summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')}
+if config_all.has_key('CONFIG_TCG')
+ summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')}
+ summary_info += {'TCG interpreter': config_host.has_key('CONFIG_TCG_INTERPRETER')}
+endif
summary_info += {'target list': ' '.join(target_dirs)}
+if have_system
+ summary_info += {'default devices': get_option('default_devices')}
+endif
+summary(summary_info, bool_yn: true, section: 'Targets and accelerators')
+
+summary_info = {}
summary_info += {'sparse enabled': sparse.found()}
if targetos == 'darwin'
summary_info += {'Cocoa support': cocoa.found()}
@@ -2447,25 +2471,12 @@
summary_info += {'VNC JPEG support': jpeg.found()}
summary_info += {'VNC PNG support': png.found()}
endif
-summary_info += {'xen support': config_host.has_key('CONFIG_XEN_BACKEND')}
-if config_host.has_key('CONFIG_XEN_BACKEND')
- summary_info += {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INTERFACE_VERSION']}
-endif
summary_info += {'brlapi support': brlapi.found()}
summary_info += {'vde support': config_host.has_key('CONFIG_VDE')}
summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')}
summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
summary_info += {'Linux io_uring support': config_host.has_key('CONFIG_LINUX_IO_URING')}
summary_info += {'ATTR/XATTR support': libattr.found()}
-summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')}
-summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')}
-summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')}
-summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')}
-summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')}
-if config_all.has_key('CONFIG_TCG')
- summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')}
- summary_info += {'TCG interpreter': config_host.has_key('CONFIG_TCG_INTERPRETER')}
-endif
summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt}
@@ -2527,7 +2538,6 @@
summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()}
-summary_info += {'default devices': get_option('default_devices')}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary_info += {'FUSE exports': fuse.found()}
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RFC PATCH v2 6/8] meson: Display block layer information altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2021-01-21 9:56 ` [PATCH v2 5/8] meson: Display accelerators and selected targets altogether Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:56 ` [PATCH v2 7/8] meson: Display cryto-related " Philippe Mathieu-Daudé
` (2 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé, qemu-block
Display block layer information altogether,
when it is relevant.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: qemu-block@nongnu.org
Should coroutine be displayed generically (here, in Misc?)
or restricted to have_block?
There is probably more features I missed...
---
meson.build | 45 ++++++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/meson.build b/meson.build
index a0945749f94..e372b69f163 100644
--- a/meson.build
+++ b/meson.build
@@ -2325,6 +2325,7 @@
summary_info += {'Documentation': build_docs}
summary_info += {'system-mode emulation': have_system}
summary_info += {'user-mode emulation': have_user}
+summary_info += {'block layer': have_block}
summary_info += {'Install blobs': get_option('install_blobs')}
# TODO: add back version
summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
@@ -2427,6 +2428,31 @@
endif
summary(summary_info, bool_yn: true, section: 'Targets and accelerators')
+# Block layer
+summary_info = {}
+summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
+summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] == '1'}
+if have_block
+ summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
+ summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
+ summary_info += {'VirtFS support': have_virtfs}
+ summary_info += {'build virtiofs daemon': have_virtiofsd}
+ summary_info += {'Live block migration': config_host.has_key('CONFIG_LIVE_BLOCK_MIGRATION')}
+ summary_info += {'replication support': config_host.has_key('CONFIG_REPLICATION')}
+ summary_info += {'bochs support': config_host.has_key('CONFIG_BOCHS')}
+ summary_info += {'cloop support': config_host.has_key('CONFIG_CLOOP')}
+ summary_info += {'dmg support': config_host.has_key('CONFIG_DMG')}
+ summary_info += {'qcow v1 support': config_host.has_key('CONFIG_QCOW1')}
+ summary_info += {'vdi support': config_host.has_key('CONFIG_VDI')}
+ summary_info += {'vvfat support': config_host.has_key('CONFIG_VVFAT')}
+ summary_info += {'qed support': config_host.has_key('CONFIG_QED')}
+ summary_info += {'parallels support': config_host.has_key('CONFIG_PARALLELS')}
+ summary_info += {'sheepdog support': config_host.has_key('CONFIG_SHEEPDOG')}
+ summary_info += {'FUSE exports': fuse.found()}
+ summary_info += {'FUSE lseek': fuse_lseek.found()}
+endif
+summary(summary_info, bool_yn: true, section: 'Block layer support')
+
summary_info = {}
summary_info += {'sparse enabled': sparse.found()}
if targetos == 'darwin'
@@ -2460,10 +2486,6 @@
# TODO: add back version
summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
summary_info += {'curl support': curl.found()}
-summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
-summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
-summary_info += {'VirtFS support': have_virtfs}
-summary_info += {'build virtiofs daemon': have_virtiofsd}
summary_info += {'Multipath support': mpathpersist.found()}
summary_info += {'VNC support': vnc.found()}
if vnc.found()
@@ -2509,14 +2531,11 @@
summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI')}
endif
summary_info += {'seccomp support': seccomp.found()}
-summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
-summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] == '1'}
summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
summary_info += {'GlusterFS support': glusterfs.found()}
summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
summary_info += {'QOM debugging': config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
-summary_info += {'Live block migration': config_host.has_key('CONFIG_LIVE_BLOCK_MIGRATION')}
summary_info += {'lzo support': lzo.found()}
summary_info += {'snappy support': snappy.found()}
summary_info += {'bzip2 support': libbzip2.found()}
@@ -2524,24 +2543,12 @@
summary_info += {'zstd support': zstd.found()}
summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')}
-summary_info += {'replication support': config_host.has_key('CONFIG_REPLICATION')}
-summary_info += {'bochs support': config_host.has_key('CONFIG_BOCHS')}
-summary_info += {'cloop support': config_host.has_key('CONFIG_CLOOP')}
-summary_info += {'dmg support': config_host.has_key('CONFIG_DMG')}
-summary_info += {'qcow v1 support': config_host.has_key('CONFIG_QCOW1')}
-summary_info += {'vdi support': config_host.has_key('CONFIG_VDI')}
-summary_info += {'vvfat support': config_host.has_key('CONFIG_VVFAT')}
-summary_info += {'qed support': config_host.has_key('CONFIG_QED')}
-summary_info += {'parallels support': config_host.has_key('CONFIG_PARALLELS')}
-summary_info += {'sheepdog support': config_host.has_key('CONFIG_SHEEPDOG')}
summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt}
summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
-summary_info += {'FUSE exports': fuse.found()}
-summary_info += {'FUSE lseek': fuse_lseek.found()}
summary(summary_info, bool_yn: true, section: 'Misc')
if not supported_cpus.contains(cpu)
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 7/8] meson: Display cryto-related information altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2021-01-21 9:56 ` [RFC PATCH v2 6/8] meson: Display block layer information altogether Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 9:58 ` Philippe Mathieu-Daudé
2021-01-21 10:11 ` Daniel P. Berrangé
2021-01-21 9:56 ` [PATCH v2 8/8] meson: Display library dependencies altogether Philippe Mathieu-Daudé
2021-01-21 12:03 ` [PATCH v2 0/8] meson: Clarify summary Paolo Bonzini
8 siblings, 2 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Daniel P . Berrange
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Daniel P. Berrange <berrange@redhat.com>
---
meson.build | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/meson.build b/meson.build
index e372b69f163..9274775a81a 100644
--- a/meson.build
+++ b/meson.build
@@ -2453,19 +2453,8 @@
endif
summary(summary_info, bool_yn: true, section: 'Block layer support')
+# Crypto
summary_info = {}
-summary_info += {'sparse enabled': sparse.found()}
-if targetos == 'darwin'
- summary_info += {'Cocoa support': cocoa.found()}
-endif
-# TODO: add back version
-summary_info += {'SDL support': sdl.found()}
-summary_info += {'SDL image support': sdl_image.found()}
-# TODO: add back version
-summary_info += {'GTK support': gtk.found()}
-summary_info += {'pixman': pixman.found()}
-# TODO: add back version
-summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
summary_info += {'TLS priority': config_host['CONFIG_TLS_PRIORITY']}
summary_info += {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS')}
# TODO: add back version
@@ -2479,6 +2468,24 @@
if config_host.has_key('CONFIG_NETTLE')
summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
endif
+summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
+summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
+summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
+summary(summary_info, bool_yn: true, section: 'Crypto')
+
+summary_info = {}
+summary_info += {'sparse enabled': sparse.found()}
+if targetos == 'darwin'
+ summary_info += {'Cocoa support': cocoa.found()}
+endif
+# TODO: add back version
+summary_info += {'SDL support': sdl.found()}
+summary_info += {'SDL image support': sdl_image.found()}
+# TODO: add back version
+summary_info += {'GTK support': gtk.found()}
+summary_info += {'pixman': pixman.found()}
+# TODO: add back version
+summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
summary_info += {'iconv support': iconv.found()}
@@ -2531,7 +2538,6 @@
summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI')}
endif
summary_info += {'seccomp support': seccomp.found()}
-summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
summary_info += {'GlusterFS support': glusterfs.found()}
summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
@@ -2547,8 +2553,6 @@
summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()}
-summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
-summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary(summary_info, bool_yn: true, section: 'Misc')
if not supported_cpus.contains(cpu)
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
2021-01-21 9:56 ` [PATCH v2 7/8] meson: Display cryto-related " Philippe Mathieu-Daudé
@ 2021-01-21 9:58 ` Philippe Mathieu-Daudé
2021-01-21 10:11 ` Daniel P. Berrangé
1 sibling, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:58 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Daniel P . Berrange
Typo "crypto" in subject =)
On 1/21/21 10:56 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Daniel P. Berrange <berrange@redhat.com>
> ---
> meson.build | 34 +++++++++++++++++++---------------
> 1 file changed, 19 insertions(+), 15 deletions(-)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
2021-01-21 9:56 ` [PATCH v2 7/8] meson: Display cryto-related " Philippe Mathieu-Daudé
2021-01-21 9:58 ` Philippe Mathieu-Daudé
@ 2021-01-21 10:11 ` Daniel P. Berrangé
2021-01-21 10:13 ` Daniel P. Berrangé
1 sibling, 1 reply; 14+ messages in thread
From: Daniel P. Berrangé @ 2021-01-21 10:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
On Thu, Jan 21, 2021 at 10:56:15AM +0100, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Daniel P. Berrange <berrange@redhat.com>
> ---
> meson.build | 34 +++++++++++++++++++---------------
> 1 file changed, 19 insertions(+), 15 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index e372b69f163..9274775a81a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2453,19 +2453,8 @@
> endif
> summary(summary_info, bool_yn: true, section: 'Block layer support')
>
> +# Crypto
Rather than a comment why not introduce grouping in the output
so it is visible when reading the summary.
This can be done in meson by calling summary() multiple times
giving "section: 'Crypto'" arg.
> summary_info = {}
> -summary_info += {'sparse enabled': sparse.found()}
> -if targetos == 'darwin'
> - summary_info += {'Cocoa support': cocoa.found()}
> -endif
> -# TODO: add back version
> -summary_info += {'SDL support': sdl.found()}
> -summary_info += {'SDL image support': sdl_image.found()}
> -# TODO: add back version
> -summary_info += {'GTK support': gtk.found()}
> -summary_info += {'pixman': pixman.found()}
> -# TODO: add back version
> -summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
> summary_info += {'TLS priority': config_host['CONFIG_TLS_PRIORITY']}
> summary_info += {'GNUTLS support': config_host.has_key('CONFIG_GNUTLS')}
> # TODO: add back version
> @@ -2479,6 +2468,24 @@
> if config_host.has_key('CONFIG_NETTLE')
> summary_info += {' XTS': not config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
> endif
> +summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
> +summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
> +summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
> +summary(summary_info, bool_yn: true, section: 'Crypto')
> +
> +summary_info = {}
> +summary_info += {'sparse enabled': sparse.found()}
> +if targetos == 'darwin'
> + summary_info += {'Cocoa support': cocoa.found()}
> +endif
> +# TODO: add back version
> +summary_info += {'SDL support': sdl.found()}
> +summary_info += {'SDL image support': sdl_image.found()}
> +# TODO: add back version
> +summary_info += {'GTK support': gtk.found()}
> +summary_info += {'pixman': pixman.found()}
> +# TODO: add back version
> +summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
> summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
> summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
> summary_info += {'iconv support': iconv.found()}
> @@ -2531,7 +2538,6 @@
> summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI')}
> endif
> summary_info += {'seccomp support': seccomp.found()}
> -summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
> summary_info += {'GlusterFS support': glusterfs.found()}
> summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
> summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
> @@ -2547,8 +2553,6 @@
> summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
> summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
> summary_info += {'libudev': libudev.found()}
> -summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
> -summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
> summary(summary_info, bool_yn: true, section: 'Misc')
>
> if not supported_cpus.contains(cpu)
> --
> 2.26.2
>
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] 14+ messages in thread* Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
2021-01-21 10:11 ` Daniel P. Berrangé
@ 2021-01-21 10:13 ` Daniel P. Berrangé
2021-01-21 11:01 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 14+ messages in thread
From: Daniel P. Berrangé @ 2021-01-21 10:13 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
On Thu, Jan 21, 2021 at 10:11:32AM +0000, Daniel P. Berrangé wrote:
> On Thu, Jan 21, 2021 at 10:56:15AM +0100, Philippe Mathieu-Daudé wrote:
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> > Cc: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > meson.build | 34 +++++++++++++++++++---------------
> > 1 file changed, 19 insertions(+), 15 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index e372b69f163..9274775a81a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -2453,19 +2453,8 @@
> > endif
> > summary(summary_info, bool_yn: true, section: 'Block layer support')
> >
> > +# Crypto
>
> Rather than a comment why not introduce grouping in the output
> so it is visible when reading the summary.
>
> This can be done in meson by calling summary() multiple times
> giving "section: 'Crypto'" arg.
Sigh, I'm not very good at reading this morning. I see this
is in fact done in this patch, I just couldn't see it in the
diff :-(
...
> > +summary(summary_info, bool_yn: true, section: 'Crypto')
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] 14+ messages in thread
* Re: [PATCH v2 7/8] meson: Display cryto-related information altogether
2021-01-21 10:13 ` Daniel P. Berrangé
@ 2021-01-21 11:01 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 11:01 UTC (permalink / raw)
To: Daniel P. Berrangé; +Cc: Paolo Bonzini, qemu-devel
On 1/21/21 11:13 AM, Daniel P. Berrangé wrote:
> On Thu, Jan 21, 2021 at 10:11:32AM +0000, Daniel P. Berrangé wrote:
>> On Thu, Jan 21, 2021 at 10:56:15AM +0100, Philippe Mathieu-Daudé wrote:
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>> Cc: Daniel P. Berrange <berrange@redhat.com>
>>> ---
>>> meson.build | 34 +++++++++++++++++++---------------
>>> 1 file changed, 19 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/meson.build b/meson.build
>>> index e372b69f163..9274775a81a 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -2453,19 +2453,8 @@
>>> endif
>>> summary(summary_info, bool_yn: true, section: 'Block layer support')
>>>
>>> +# Crypto
>>
>> Rather than a comment why not introduce grouping in the output
>> so it is visible when reading the summary.
>>
>> This can be done in meson by calling summary() multiple times
>> giving "section: 'Crypto'" arg.
>
> Sigh, I'm not very good at reading this morning. I see this
> is in fact done in this patch, I just couldn't see it in the
> diff :-(
No worry, I should have describe this better in the commit
description.
> ...
>>> +summary(summary_info, bool_yn: true, section: 'Crypto')
>
>
> Regards,
> Daniel
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 8/8] meson: Display library dependencies altogether
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2021-01-21 9:56 ` [PATCH v2 7/8] meson: Display cryto-related " Philippe Mathieu-Daudé
@ 2021-01-21 9:56 ` Philippe Mathieu-Daudé
2021-01-21 12:03 ` [PATCH v2 0/8] meson: Clarify summary Paolo Bonzini
8 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-21 9:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 62 ++++++++++++++++++++++++++++-------------------------
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/meson.build b/meson.build
index 9274775a81a..8535a83fb70 100644
--- a/meson.build
+++ b/meson.build
@@ -2473,6 +2473,7 @@
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary(summary_info, bool_yn: true, section: 'Crypto')
+# Libraries
summary_info = {}
summary_info += {'sparse enabled': sparse.found()}
if targetos == 'darwin'
@@ -2503,22 +2504,6 @@
summary_info += {'brlapi support': brlapi.found()}
summary_info += {'vde support': config_host.has_key('CONFIG_VDE')}
summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')}
-summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
-summary_info += {'Linux io_uring support': config_host.has_key('CONFIG_LINUX_IO_URING')}
-summary_info += {'ATTR/XATTR support': libattr.found()}
-summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
-summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
-summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt}
-summary_info += {'libcap-ng support': libcap_ng.found()}
-summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
-summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
-summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
-summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
-summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
-summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
-summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
-summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
-summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
# TODO: add back protocol and server version
summary_info += {'spice support': config_host.has_key('CONFIG_SPICE')}
summary_info += {'rbd support': rbd.found()}
@@ -2531,28 +2516,47 @@
summary_info += {'OpenGL dmabufs': config_host.has_key('CONFIG_OPENGL_DMABUF')}
summary_info += {'libiscsi support': libiscsi.found()}
summary_info += {'libnfs support': libnfs.found()}
+summary_info += {'ATTR/XATTR support': libattr.found()}
+summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
+summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
+summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt}
+summary_info += {'libcap-ng support': libcap_ng.found()}
+summary_info += {'seccomp support': seccomp.found()}
+summary_info += {'GlusterFS support': glusterfs.found()}
+summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
+summary_info += {'lzo support': lzo.found()}
+summary_info += {'snappy support': snappy.found()}
+summary_info += {'bzip2 support': libbzip2.found()}
+summary_info += {'lzfse support': liblzfse.found()}
+summary_info += {'zstd support': zstd.found()}
+summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')}
+summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt}
+summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
+summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
+summary_info += {'libudev': libudev.found()}
+summary(summary_info, bool_yn: true, section: 'Dependencies')
+
+summary_info = {}
+summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
+summary_info += {'Linux io_uring support': config_host.has_key('CONFIG_LINUX_IO_URING')}
+summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
+summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
+summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
+summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
+summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
+summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
+summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
+summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
+summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
summary_info += {'build guest agent': config_host.has_key('CONFIG_GUEST_AGENT')}
if targetos == 'windows'
summary_info += {'QGA VSS support': config_host.has_key('CONFIG_QGA_VSS')}
summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI')}
endif
-summary_info += {'seccomp support': seccomp.found()}
-summary_info += {'GlusterFS support': glusterfs.found()}
summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
-summary_info += {'libssh support': config_host.has_key('CONFIG_LIBSSH')}
summary_info += {'QOM debugging': config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
-summary_info += {'lzo support': lzo.found()}
-summary_info += {'snappy support': snappy.found()}
-summary_info += {'bzip2 support': libbzip2.found()}
-summary_info += {'lzfse support': liblzfse.found()}
-summary_info += {'zstd support': zstd.found()}
summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
-summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')}
-summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt}
-summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
-summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
-summary_info += {'libudev': libudev.found()}
summary(summary_info, bool_yn: true, section: 'Misc')
if not supported_cpus.contains(cpu)
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2 0/8] meson: Clarify summary
2021-01-21 9:56 [PATCH v2 0/8] meson: Clarify summary Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2021-01-21 9:56 ` [PATCH v2 8/8] meson: Display library dependencies altogether Philippe Mathieu-Daudé
@ 2021-01-21 12:03 ` Paolo Bonzini
8 siblings, 0 replies; 14+ messages in thread
From: Paolo Bonzini @ 2021-01-21 12:03 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
On 21/01/21 10:56, Philippe Mathieu-Daudé wrote:
> Reorder stuffs in summary to quicker understand bug reports.
>
> Remove information from deselected features when not necessary.
>
> Since v2:
> - integrate Paolo's summary sections
> - simpler sort
>
> Philippe Mathieu-Daudé (8):
> meson: Summarize information related to directories first
> meson: Display host binaries information altogether
> meson: Summarize overall features altogether
> meson: Summarize compilation-related information altogether
> meson: Display accelerators and selected targets altogether
> meson: Display block layer information altogether
> meson: Display cryto-related information altogether
> meson: Display library dependencies altogether
>
> meson.build | 295 ++++++++++++++++++++++++++++++----------------------
> 1 file changed, 171 insertions(+), 124 deletions(-)
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 14+ messages in thread