KVM: stats: Fix value for KVM_STATS_UNIT_MAX for boolean stats
Subsystems (2)
PATCH 1/1 KVM: stats: Fix value for KVM_STATS_UNIT_MAX for boolean stats
commit 1b870fa5573e ("kvm: stats: tell userspace which values are boolean") added a new stat unit (boolean) but failed to raise KVM_STATS_UNIT_MAX.
Fix by pointing UNIT_MAX at the new max value of UNIT_BOOLEAN.
---
Tested with kvm_binary_stats_test, which now passes.
Sending out a few improvements to assertions in kvm_binary_stats_test separately.
Documentation/virt/kvm/api.rst | 2 +- include/uapi/linux/kvm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/virt/kvm/api.rst +1 -1
@@ -5658,7 +5658,7 @@ by a string of size ``name_size``. #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_UNIT_MAX KVM_STATS_UNIT_BOOLEAN #define KVM_STATS_BASE_SHIFT 8 #define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT)
include/uapi/linux/kvm.h +1 -1
@@ -2084,7 +2084,7 @@ struct kvm_stats_header {#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_UNIT_MAX KVM_STATS_UNIT_BOOLEAN#define KVM_STATS_BASE_SHIFT 8#define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT)
base-commit: 79629181607e801c0b41b8790ac4ee2eb5d7bc3e
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
Paolo Bonzini
maintainerQuoted 47 lines · Oliver Upton
commit
1b870fa5573e("kvm: stats: tell userspace which values are boolean") added a new stat unit (boolean) but failed to raiseKVM_STATS_UNIT_MAX.Fix by pointing
UNIT_MAXat the new max value ofUNIT_BOOLEAN.Fixes 1b870fa5573e ("kvm: stats: tell userspace which values are boolean")Reported-by Janis Schoetterl-Glausch <[email protected]>Signed-off-by Oliver Upton <[email protected]>---
Tested with
kvm_binary_stats_test, which now passes.Sending out a few improvements to assertions in
kvm_binary_stats_testseparately.Documentation/virt/kvm/api.rst | 2 +- include/uapi/linux/kvm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)Documentation/virt/kvm/api.rst +1
-1@@ -5658,7 +5658,7 @@ by a string of size ``name_size``. #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_UNIT_MAX KVM_STATS_UNIT_BOOLEAN #define KVM_STATS_BASE_SHIFT 8 #define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT)include/uapi/linux/kvm.h +1
-1@@ -2084,7 +2084,7 @@ struct kvm_stats_header {#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_UNIT_MAX KVM_STATS_UNIT_BOOLEAN#define KVM_STATS_BASE_SHIFT 8#define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT)
Quoted 1 line
base-commit:
79629181607e801c0b41b8790ac4ee2eb5d7bc3e
Oops, thanks.
Paolo