mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
* statistics subsystem
* virtio reset cleanups * build system cleanups * fix Cirrus CI -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmKpooQUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroNlFwf+OugLGRZl3KVc7akQwUJe9gg2T31h VkC+7Tei8FAwe8vDppVd+CYEIi0M3acxD2amRrv2etCCGSuySN1PbkfRcSfPBX01 pRWpasdhfqnZR8Iidi7YW1Ou5CcGqKH49nunBhW10+osb/mu5sVscMuOJgTDj/lK CpsmDyk6572yGmczjNLlmhYcTU36clHpAZgazZHwk1PU+B3fCKlYYyvUpT3ItJvd cK92aIUWrfofl3yTy0k4IwvZwNjTBirlstOIomZ333xzSA+mm5TR+mTvGRTZ69+a v+snpMp4ILDMoB5kxQ42kK5WpdiN//LnriA9CBFDtOidsDDn8kx7gJe2RA== =Dxwa -----END PGP SIGNATURE----- Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging * statistics subsystem * virtio reset cleanups * build system cleanups * fix Cirrus CI # -----BEGIN PGP SIGNATURE----- # # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmKpooQUHHBib256aW5p # QHJlZGhhdC5jb20ACgkQv/vSX3jHroNlFwf+OugLGRZl3KVc7akQwUJe9gg2T31h # VkC+7Tei8FAwe8vDppVd+CYEIi0M3acxD2amRrv2etCCGSuySN1PbkfRcSfPBX01 # pRWpasdhfqnZR8Iidi7YW1Ou5CcGqKH49nunBhW10+osb/mu5sVscMuOJgTDj/lK # CpsmDyk6572yGmczjNLlmhYcTU36clHpAZgazZHwk1PU+B3fCKlYYyvUpT3ItJvd # cK92aIUWrfofl3yTy0k4IwvZwNjTBirlstOIomZ333xzSA+mm5TR+mTvGRTZ69+a # v+snpMp4ILDMoB5kxQ42kK5WpdiN//LnriA9CBFDtOidsDDn8kx7gJe2RA== # =Dxwa # -----END PGP SIGNATURE----- # gpg: Signature made Wed 15 Jun 2022 02:12:36 AM PDT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: (21 commits) build: include pc-bios/ part in the ROMS variable meson: put cross compiler info in a separate section q35:Enable TSEG only when G_SMRAME and TSEG_EN both enabled build: fix check for -fsanitize-coverage-allowlist tests/vm: allow running tests in an unconfigured source tree configure: cleanup -fno-pie detection configure: update list of preserved environment variables virtio-mmio: cleanup reset virtio: stop ioeventfd on reset virtio-mmio: stop ioeventfd on legacy reset s390x: simplify virtio_ccw_reset_virtio block: add more commands to preconfig mode hmp: add filtering of statistics by name qmp: add filtering of statistics by name hmp: add filtering of statistics by provider qmp: add filtering of statistics by provider hmp: add basic "info stats" implementation cutils: add functions for IEC and SI prefixes qmp: add filtering of statistics by target vCPU kvm: Support for querying fd-based stats ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
commit
def6fd6c9c
25 changed files with 1368 additions and 115 deletions
25
meson.build
25
meson.build
|
@ -209,9 +209,13 @@ if get_option('fuzzing')
|
|||
configure_file(output: 'instrumentation-filter',
|
||||
input: 'scripts/oss-fuzz/instrumentation-filter-template',
|
||||
copy: true)
|
||||
add_global_arguments(
|
||||
cc.get_supported_arguments('-fsanitize-coverage-allowlist=instrumentation-filter'),
|
||||
native: false, language: ['c', 'cpp', 'objc'])
|
||||
|
||||
if cc.compiles('int main () { return 0; }',
|
||||
name: '-fsanitize-coverage-allowlist=/dev/null',
|
||||
args: ['-fsanitize-coverage-allowlist=/dev/null'] )
|
||||
add_global_arguments('-fsanitize-coverage-allowlist=instrumentation-filter',
|
||||
native: false, language: ['c', 'cpp', 'objc'])
|
||||
endif
|
||||
|
||||
if get_option('fuzzing_engine') == ''
|
||||
# Add CFLAGS to tell clang to add fuzzer-related instrumentation to all the
|
||||
|
@ -3767,21 +3771,24 @@ endif
|
|||
summary_info += {'strip binaries': get_option('strip')}
|
||||
summary_info += {'sparse': sparse}
|
||||
summary_info += {'mingw32 support': targetos == 'windows'}
|
||||
summary(summary_info, bool_yn: true, section: 'Compilation')
|
||||
|
||||
# snarf the cross-compilation information for tests
|
||||
summary_info = {}
|
||||
have_cross = false
|
||||
foreach target: target_dirs
|
||||
tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak'
|
||||
if fs.exists(tcg_mak)
|
||||
config_cross_tcg = keyval.load(tcg_mak)
|
||||
target = config_cross_tcg['TARGET_NAME']
|
||||
compiler = ''
|
||||
if 'CC' in config_cross_tcg
|
||||
summary_info += {target + ' tests': config_cross_tcg['CC']}
|
||||
summary_info += {config_cross_tcg['TARGET_NAME']: config_cross_tcg['CC']}
|
||||
have_cross = true
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endforeach
|
||||
|
||||
summary(summary_info, bool_yn: true, section: 'Compilation')
|
||||
if have_cross
|
||||
summary(summary_info, bool_yn: true, section: 'Cross compilers')
|
||||
endif
|
||||
|
||||
# Targets and accelerators
|
||||
summary_info = {}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue