Commit 8ae76481 authored by Jason Zeng's avatar Jason Zeng
Browse files

kvm: fix KVM_STATS_TYPE_MAX 

intel inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB5TKJ


CVE: NA

--------------------------------------------------

Commit 06f89a27 ("kvm: debugfs: Export vcpu stat via debugfs")
forgot to update KVM_STATS_TYPE_MAX in include/uapi/linux/kvm.h,
and forgot to update header file in tools/ folder. This causes kernel
KVM selftests failure.

Fixes: 06f89a27 ("kvm: debugfs: Export vcpu stat via debugfs")
Signed-off-by: default avatarJason Zeng <jason.zeng@intel.com>
parent c6c933e9

include/uapi/linux/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -2232,7 +2232,7 @@ struct kvm_stats_header { 
#define KVM_STATS_TYPE_LINEAR_HIST	(0x3 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_LOG_HIST		(0x4 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_DFX		(0x5 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_MAX		KVM_STATS_TYPE_LOG_HIST

#define KVM_STATS_TYPE_MAX		KVM_STATS_TYPE_DFX



#define KVM_STATS_UNIT_SHIFT		4

#define KVM_STATS_UNIT_MASK		(0xF << KVM_STATS_UNIT_SHIFT)

tools/include/uapi/linux/kvm.h

+2 −1
Original line number Diff line number Diff line
@@ -2168,7 +2168,8 @@ struct kvm_stats_header { 
#define KVM_STATS_TYPE_PEAK		(0x2 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_LINEAR_HIST	(0x3 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_LOG_HIST		(0x4 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_MAX		KVM_STATS_TYPE_LOG_HIST

#define KVM_STATS_TYPE_DFX		(0x5 << KVM_STATS_TYPE_SHIFT)

#define KVM_STATS_TYPE_MAX		KVM_STATS_TYPE_DFX



#define KVM_STATS_UNIT_SHIFT		4

#define KVM_STATS_UNIT_MASK		(0xF << KVM_STATS_UNIT_SHIFT)