@@ -1789,55 +1789,55 @@ struct _kvm_stats_desc {
#define STATS_DESC(SCOPE, stat, type, unit, base, exp, sz, bsz) \
SCOPE##_STATS_DESC(stat, type, unit, base, exp, sz, bsz)
-#define STATS_DESC_CUMULATIVE(SCOPE, name, unit, base, exponent) \
- STATS_DESC(SCOPE, name, KVM_STATS_TYPE_CUMULATIVE, \
+#define STATS_DESC_CUMULATIVE(SCOPE, stat, unit, base, exponent) \
+ STATS_DESC(SCOPE, stat, KVM_STATS_TYPE_CUMULATIVE, \
unit, base, exponent, 1, 0)
-#define STATS_DESC_INSTANT(SCOPE, name, unit, base, exponent) \
- STATS_DESC(SCOPE, name, KVM_STATS_TYPE_INSTANT, \
+#define STATS_DESC_INSTANT(SCOPE, stat, unit, base, exponent) \
+ STATS_DESC(SCOPE, stat, KVM_STATS_TYPE_INSTANT, \
unit, base, exponent, 1, 0)
-#define STATS_DESC_PEAK(SCOPE, name, unit, base, exponent) \
- STATS_DESC(SCOPE, name, KVM_STATS_TYPE_PEAK, \
+#define STATS_DESC_PEAK(SCOPE, stat, unit, base, exponent) \
+ STATS_DESC(SCOPE, stat, KVM_STATS_TYPE_PEAK, \
unit, base, exponent, 1, 0)
-#define STATS_DESC_LINEAR_HIST(SCOPE, name, unit, base, exponent, sz, bsz) \
- STATS_DESC(SCOPE, name, KVM_STATS_TYPE_LINEAR_HIST, \
+#define STATS_DESC_LINEAR_HIST(SCOPE, stat, unit, base, exponent, sz, bsz) \
+ STATS_DESC(SCOPE, stat, KVM_STATS_TYPE_LINEAR_HIST, \
unit, base, exponent, sz, bsz)
-#define STATS_DESC_LOG_HIST(SCOPE, name, unit, base, exponent, sz) \
- STATS_DESC(SCOPE, name, KVM_STATS_TYPE_LOG_HIST, \
+#define STATS_DESC_LOG_HIST(SCOPE, stat, unit, base, exponent, sz) \
+ STATS_DESC(SCOPE, stat, KVM_STATS_TYPE_LOG_HIST, \
unit, base, exponent, sz, 0)
/* Cumulative counter, read/write */
-#define STATS_DESC_COUNTER(SCOPE, name) \
- STATS_DESC_CUMULATIVE(SCOPE, name, KVM_STATS_UNIT_NONE, \
+#define STATS_DESC_COUNTER(SCOPE, stat) \
+ STATS_DESC_CUMULATIVE(SCOPE, stat, KVM_STATS_UNIT_NONE, \
KVM_STATS_BASE_POW10, 0)
/* Instantaneous counter, read only */
-#define STATS_DESC_ICOUNTER(SCOPE, name) \
- STATS_DESC_INSTANT(SCOPE, name, KVM_STATS_UNIT_NONE, \
+#define STATS_DESC_ICOUNTER(SCOPE, stat) \
+ STATS_DESC_INSTANT(SCOPE, stat, KVM_STATS_UNIT_NONE, \
KVM_STATS_BASE_POW10, 0)
/* Peak counter, read/write */
-#define STATS_DESC_PCOUNTER(SCOPE, name) \
- STATS_DESC_PEAK(SCOPE, name, KVM_STATS_UNIT_NONE, \
+#define STATS_DESC_PCOUNTER(SCOPE, stat) \
+ STATS_DESC_PEAK(SCOPE, stat, KVM_STATS_UNIT_NONE, \
KVM_STATS_BASE_POW10, 0)
/* Instantaneous boolean value, read only */
-#define STATS_DESC_IBOOLEAN(SCOPE, name) \
- STATS_DESC_INSTANT(SCOPE, name, KVM_STATS_UNIT_BOOLEAN, \
+#define STATS_DESC_IBOOLEAN(SCOPE, stat) \
+ STATS_DESC_INSTANT(SCOPE, stat, KVM_STATS_UNIT_BOOLEAN, \
KVM_STATS_BASE_POW10, 0)
/* Peak (sticky) boolean value, read/write */
-#define STATS_DESC_PBOOLEAN(SCOPE, name) \
- STATS_DESC_PEAK(SCOPE, name, KVM_STATS_UNIT_BOOLEAN, \
+#define STATS_DESC_PBOOLEAN(SCOPE, stat) \
+ STATS_DESC_PEAK(SCOPE, stat, KVM_STATS_UNIT_BOOLEAN, \
KVM_STATS_BASE_POW10, 0)
/* Cumulative time in nanosecond */
-#define STATS_DESC_TIME_NSEC(SCOPE, name) \
- STATS_DESC_CUMULATIVE(SCOPE, name, KVM_STATS_UNIT_SECONDS, \
+#define STATS_DESC_TIME_NSEC(SCOPE, stat) \
+ STATS_DESC_CUMULATIVE(SCOPE, stat, KVM_STATS_UNIT_SECONDS, \
KVM_STATS_BASE_POW10, -9)
/* Linear histogram for time in nanosecond */
-#define STATS_DESC_LINHIST_TIME_NSEC(SCOPE, name, sz, bsz) \
- STATS_DESC_LINEAR_HIST(SCOPE, name, KVM_STATS_UNIT_SECONDS, \
+#define STATS_DESC_LINHIST_TIME_NSEC(SCOPE, stat, sz, bsz) \
+ STATS_DESC_LINEAR_HIST(SCOPE, stat, KVM_STATS_UNIT_SECONDS, \
KVM_STATS_BASE_POW10, -9, sz, bsz)
/* Logarithmic histogram for time in nanosecond */
-#define STATS_DESC_LOGHIST_TIME_NSEC(SCOPE, name, sz) \
- STATS_DESC_LOG_HIST(SCOPE, name, KVM_STATS_UNIT_SECONDS, \
+#define STATS_DESC_LOGHIST_TIME_NSEC(SCOPE, stat, sz) \
+ STATS_DESC_LOG_HIST(SCOPE, stat, KVM_STATS_UNIT_SECONDS, \
KVM_STATS_BASE_POW10, -9, sz)
#define KVM_GENERIC_VM_STATS() \
Consistently use "stat" instead of a mix of "stat" and "name" in the various KVM stats macros. This improves the readability, and also enables a future commit to add a separate "name" parameter. No functional change intended. Signed-off-by: David Matlack <dmatlack@google.com> --- include/linux/kvm_host.h | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-)