* [PATCH 0/9] meson: Clarify summary
@ 2021-01-19 18:49 Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 1/9] meson: Summarize generic information first Philippe Mathieu-Daudé
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Reorder stuffs in summary to quicker understand bug reports.
Remove information from deselected features when not necessary.
Philippe Mathieu-Daudé (9):
meson: Summarize generic information first
meson: Summarize compilation information altogether
meson: Summarize host binaries altogether
meson: Summarize accelerators altogether
meson: Display if system emulation is selected in summary
meson: Restrict system-mode specific accelerators
meson: Do not configure audio if system-mode is not selected
meson: Display if user-mode emulation is selected in summary
meson: Summarize block layer information altogether
configure | 6 +++
meson.build | 132 +++++++++++++++++++++++++++++-----------------------
2 files changed, 81 insertions(+), 57 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/9] meson: Summarize generic information first
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
@ 2021-01-19 18:49 ` Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 2/9] meson: Summarize compilation information altogether Philippe Mathieu-Daudé
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Move generic summary information on top.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 3d889857a09..ddac09ca159 100644
--- a/meson.build
+++ b/meson.build
@@ -2301,6 +2301,9 @@
summary_info += {'Source path': meson.current_source_dir()}
summary_info += {'GIT binary': config_host['GIT']}
summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
+summary_info += {'Documentation': build_docs}
+summary_info += {'Install blobs': get_option('install_blobs')}
+
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'
@@ -2397,14 +2400,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')}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/9] meson: Summarize compilation information altogether
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 1/9] meson: Summarize generic information first Philippe Mathieu-Daudé
@ 2021-01-19 18:49 ` Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 3/9] meson: Summarize host binaries altogether Philippe Mathieu-Daudé
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 53 ++++++++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/meson.build b/meson.build
index ddac09ca159..27a2b67c42d 100644
--- a/meson.build
+++ b/meson.build
@@ -2304,6 +2304,8 @@
summary_info += {'Documentation': build_docs}
summary_info += {'Install blobs': get_option('install_blobs')}
+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'
@@ -2329,6 +2331,32 @@
endif
summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']}
summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']}
+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_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()}
@@ -2342,15 +2370,8 @@
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)}
-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 += {'static build': config_host.has_key('CONFIG_STATIC')}
if targetos == 'darwin'
summary_info += {'Cocoa support': cocoa.found()}
endif
@@ -2382,7 +2403,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 += {'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']}
@@ -2400,7 +2420,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')}
@@ -2415,16 +2434,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')}
@@ -2461,15 +2473,10 @@
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')}
@@ -2481,9 +2488,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')}
@@ -2504,7 +2508,6 @@
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')}
summary_info += {'FUSE exports': fuse.found()}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/9] meson: Summarize host binaries altogether
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 1/9] meson: Summarize generic information first Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 2/9] meson: Summarize compilation information altogether Philippe Mathieu-Daudé
@ 2021-01-19 18:49 ` Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 4/9] meson: Summarize accelerators altogether Philippe Mathieu-Daudé
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Display host binaries altogether in Meson summary information.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 27a2b67c42d..73c8d04bbf0 100644
--- a/meson.build
+++ b/meson.build
@@ -2360,12 +2360,16 @@
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']}
# 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')}
@@ -2505,9 +2509,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 += {'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] 13+ messages in thread
* [PATCH 4/9] meson: Summarize accelerators altogether
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-01-19 18:49 ` [PATCH 3/9] meson: Summarize host binaries altogether Philippe Mathieu-Daudé
@ 2021-01-19 18:50 ` Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 5/9] meson: Display if system emulation is selected in summary Philippe Mathieu-Daudé
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Display accelerators altogether in Meson summary information.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index 73c8d04bbf0..d89eeb8c5ce 100644
--- a/meson.build
+++ b/meson.build
@@ -2375,6 +2375,21 @@
summary_info += {'alternative module path': config_host.has_key('CONFIG_MODULE_UPGRADES')}
endif
summary_info += {'target list': ' '.join(target_dirs)}
+
+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
+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 += {'sparse enabled': sparse.found()}
if targetos == 'darwin'
summary_info += {'Cocoa support': cocoa.found()}
@@ -2419,25 +2434,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}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/9] meson: Display if system emulation is selected in summary
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2021-01-19 18:50 ` [PATCH 4/9] meson: Summarize accelerators altogether Philippe Mathieu-Daudé
@ 2021-01-19 18:50 ` Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 6/9] meson: Restrict system-mode specific accelerators Philippe Mathieu-Daudé
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index d89eeb8c5ce..940898eb5b4 100644
--- a/meson.build
+++ b/meson.build
@@ -2370,6 +2370,7 @@
summary_info += {'smbd': config_host['CONFIG_SMBD_COMMAND']}
endif
+summary_info += {'system-mode emulation': have_system}
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')}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/9] meson: Restrict system-mode specific accelerators
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2021-01-19 18:50 ` [PATCH 5/9] meson: Display if system emulation is selected in summary Philippe Mathieu-Daudé
@ 2021-01-19 18:50 ` Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 7/9] meson: Do not configure audio if system-mode is not selected Philippe Mathieu-Daudé
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Avoid displaying accelerators which are restricted to
system-emulation.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 940898eb5b4..575e34d88ac 100644
--- a/meson.build
+++ b/meson.build
@@ -2377,13 +2377,15 @@
endif
summary_info += {'target list': ' '.join(target_dirs)}
-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']}
+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')
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/9] meson: Do not configure audio if system-mode is not selected
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2021-01-19 18:50 ` [PATCH 6/9] meson: Restrict system-mode specific accelerators Philippe Mathieu-Daudé
@ 2021-01-19 18:50 ` Philippe Mathieu-Daudé
2021-01-19 18:53 ` Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 8/9] meson: Display if user-mode emulation is selected in summary Philippe Mathieu-Daudé
` (2 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 6 ++++++
meson.build | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 9f016b06b54..a15bdfb6ef3 100755
--- a/configure
+++ b/configure
@@ -2324,6 +2324,12 @@ if test -z "$want_tools"; then
fi
fi
+##########################################
+# Disable features only meaningful for system-mode emulation
+if test "$softmmu" = "no"; then
+ audio_drv_list=""
+fi
+
##########################################
# Some versions of Mac OS X incorrectly define SIZE_MAX
cat > $TMPC << EOF
diff --git a/meson.build b/meson.build
index 575e34d88ac..e6c6d1518ef 100644
--- a/meson.build
+++ b/meson.build
@@ -2425,7 +2425,9 @@
# TODO: add back version
summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
summary_info += {'curl support': curl.found()}
-summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
+if have_system
+ summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
+endif
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}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 8/9] meson: Display if user-mode emulation is selected in summary
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2021-01-19 18:50 ` [PATCH 7/9] meson: Do not configure audio if system-mode is not selected Philippe Mathieu-Daudé
@ 2021-01-19 18:50 ` Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 9/9] meson: Summarize block layer information altogether Philippe Mathieu-Daudé
2021-01-20 17:10 ` [PATCH 0/9] meson: Clarify summary Paolo Bonzini
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index e6c6d1518ef..0435bfd1c51 100644
--- a/meson.build
+++ b/meson.build
@@ -2371,6 +2371,7 @@
endif
summary_info += {'system-mode emulation': have_system}
+summary_info += {'user-mode emulation': have_user}
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')}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 9/9] meson: Summarize block layer information altogether
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2021-01-19 18:50 ` [PATCH 8/9] meson: Display if user-mode emulation is selected in summary Philippe Mathieu-Daudé
@ 2021-01-19 18:50 ` Philippe Mathieu-Daudé
2021-01-20 17:10 ` [PATCH 0/9] meson: Clarify summary Paolo Bonzini
9 siblings, 0 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé, qemu-block
Display if block layer is built. Do not display the block
specific information if not enabled.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: qemu-block@nongnu.org
---
meson.build | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index 0435bfd1c51..dd4129ae8fd 100644
--- a/meson.build
+++ b/meson.build
@@ -2372,6 +2372,7 @@
summary_info += {'system-mode emulation': have_system}
summary_info += {'user-mode emulation': have_user}
+summary_info += {'block layer': have_block}
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')}
@@ -2429,8 +2430,10 @@
if have_system
summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
endif
-summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
-summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
+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']}
+endif
summary_info += {'VirtFS support': have_virtfs}
summary_info += {'build virtiofs daemon': have_virtiofsd}
summary_info += {'Multipath support': mpathpersist.found()}
@@ -2492,7 +2495,6 @@
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()}
@@ -2500,16 +2502,19 @@
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')}
+if have_block
+ 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')}
+endif
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')}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 7/9] meson: Do not configure audio if system-mode is not selected
2021-01-19 18:50 ` [PATCH 7/9] meson: Do not configure audio if system-mode is not selected Philippe Mathieu-Daudé
@ 2021-01-19 18:53 ` Philippe Mathieu-Daudé
2021-01-20 9:09 ` Gerd Hoffmann
0 siblings, 1 reply; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 18:53 UTC (permalink / raw)
To: qemu-devel, Gerd Hoffmann; +Cc: Paolo Bonzini
Forgot to Cc Gerd, adding him.
On 1/19/21 7:50 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> configure | 6 ++++++
> meson.build | 4 +++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 9f016b06b54..a15bdfb6ef3 100755
> --- a/configure
> +++ b/configure
> @@ -2324,6 +2324,12 @@ if test -z "$want_tools"; then
> fi
> fi
>
> +##########################################
> +# Disable features only meaningful for system-mode emulation
> +if test "$softmmu" = "no"; then
> + audio_drv_list=""
> +fi
> +
> ##########################################
> # Some versions of Mac OS X incorrectly define SIZE_MAX
> cat > $TMPC << EOF
> diff --git a/meson.build b/meson.build
> index 575e34d88ac..e6c6d1518ef 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2425,7 +2425,9 @@
> # TODO: add back version
> summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
> summary_info += {'curl support': curl.found()}
> -summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
> +if have_system
> + summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
> +endif
> 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}
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 7/9] meson: Do not configure audio if system-mode is not selected
2021-01-19 18:53 ` Philippe Mathieu-Daudé
@ 2021-01-20 9:09 ` Gerd Hoffmann
0 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2021-01-20 9:09 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
> > +##########################################
> > +# Disable features only meaningful for system-mode emulation
> > +if test "$softmmu" = "no"; then
> > + audio_drv_list=""
> > +fi
> > +
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
> > ##########################################
> > # Some versions of Mac OS X incorrectly define SIZE_MAX
> > cat > $TMPC << EOF
> > diff --git a/meson.build b/meson.build
> > index 575e34d88ac..e6c6d1518ef 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -2425,7 +2425,9 @@
> > # TODO: add back version
> > summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
> > summary_info += {'curl support': curl.found()}
> > -summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
> > +if have_system
> > + summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']}
> > +endif
I guess there are alot more cfg options like that one. virgl support
for starters ;)
So maybe group them in a block?
take care,
Gerd
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/9] meson: Clarify summary
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2021-01-19 18:50 ` [PATCH 9/9] meson: Summarize block layer information altogether Philippe Mathieu-Daudé
@ 2021-01-20 17:10 ` Paolo Bonzini
9 siblings, 0 replies; 13+ messages in thread
From: Paolo Bonzini @ 2021-01-20 17:10 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
On 19/01/21 19:49, Philippe Mathieu-Daudé wrote:
> Reorder stuffs in summary to quicker understand bug reports.
>
> Remove information from deselected features when not necessary.
>
> Philippe Mathieu-Daudé (9):
> meson: Summarize generic information first
> meson: Summarize compilation information altogether
> meson: Summarize host binaries altogether
> meson: Summarize accelerators altogether
> meson: Display if system emulation is selected in summary
> meson: Restrict system-mode specific accelerators
> meson: Do not configure audio if system-mode is not selected
> meson: Display if user-mode emulation is selected in summary
> meson: Summarize block layer information altogether
>
> configure | 6 +++
> meson.build | 132 +++++++++++++++++++++++++++++-----------------------
> 2 files changed, 81 insertions(+), 57 deletions(-)
>
Very nice. (I'm just not sure about patches 5 and 8 since there's
already the target directories). A couple nits:
* sparse should go in host binaries
* WIN_SDK should go in compilation information
* It would be nice to have a comment above each of the groups
I have done the changes myself. I will also send out for review a patch
to further group dependencies and "other features" (vhost, modules, etc.).
Paolo
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-01-20 17:14 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-19 18:49 [PATCH 0/9] meson: Clarify summary Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 1/9] meson: Summarize generic information first Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 2/9] meson: Summarize compilation information altogether Philippe Mathieu-Daudé
2021-01-19 18:49 ` [PATCH 3/9] meson: Summarize host binaries altogether Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 4/9] meson: Summarize accelerators altogether Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 5/9] meson: Display if system emulation is selected in summary Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 6/9] meson: Restrict system-mode specific accelerators Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 7/9] meson: Do not configure audio if system-mode is not selected Philippe Mathieu-Daudé
2021-01-19 18:53 ` Philippe Mathieu-Daudé
2021-01-20 9:09 ` Gerd Hoffmann
2021-01-19 18:50 ` [PATCH 8/9] meson: Display if user-mode emulation is selected in summary Philippe Mathieu-Daudé
2021-01-19 18:50 ` [PATCH 9/9] meson: Summarize block layer information altogether Philippe Mathieu-Daudé
2021-01-20 17:10 ` [PATCH 0/9] meson: Clarify summary Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).