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 /linux-headers | |
| parent | fe16c833fdb74642c296fa96a472e39229cd4351 (diff) | |
| parent | 3746b8ca3e8bc216d03df5813080eeb06bdafabb (diff) | |
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 'linux-headers')
| -rw-r--r-- | linux-headers/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 0d05d02ee4..f089349149 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -2031,6 +2031,7 @@ struct kvm_stats_header { #define KVM_STATS_UNIT_BYTES (0x1 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT) +#define KVM_STATS_UNIT_BOOLEAN (0x4 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_CYCLES #define KVM_STATS_BASE_SHIFT 8 |