diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-07-21 11:13:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-07-21 11:13:01 +0100 |
| commit | 5288bee45fbd33203b61f8c76e41b15bb5913e6e (patch) | |
| tree | e1ffe86238a1f386eecf134befcfe92ba6e79d85 /qapi | |
| parent | fe16c833fdb74642c296fa96a472e39229cd4351 (diff) | |
| parent | 3746b8ca3e8bc216d03df5813080eeb06bdafabb (diff) | |
| download | qemu-5288bee45fbd33203b61f8c76e41b15bb5913e6e.zip qemu-5288bee45fbd33203b61f8c76e41b15bb5913e6e.tar.gz qemu-5288bee45fbd33203b61f8c76e41b15bb5913e6e.tar.bz2 | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
* Boolean statistics for KVM
* Fix build on Haiku
# gpg: Signature made Tue 19 Jul 2022 10:32:34 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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:
util: Fix broken build on Haiku
kvm: add support for boolean statistics
monitor: add support for boolean statistics
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/stats.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qapi/stats.json b/qapi/stats.json index 2f8bfe8..57db5b1 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -38,11 +38,12 @@ # @bytes: stat reported in bytes. # @seconds: stat reported in seconds. # @cycles: stat reported in clock cycles. +# @boolean: stat is a boolean value. # # Since: 7.1 ## { 'enum' : 'StatsUnit', - 'data' : [ 'bytes', 'seconds', 'cycles' ] } + 'data' : [ 'bytes', 'seconds', 'cycles', 'boolean' ] } ## # @StatsProvider: @@ -123,6 +124,7 @@ ## { 'alternate': 'StatsValue', 'data': { 'scalar': 'uint64', + 'boolean': 'bool', 'list': [ 'uint64' ] } } ## |