[Bionic][PATCH 1/2] KVM: s390: diagnoses are instructions as well

Joseph Salisbury joseph.salisbury at canonical.com
Mon Mar 12 15:10:33 UTC 2018


From: Christian Borntraeger <borntraeger at de.ibm.com>

BugLink: http://bugs.launchpad.net/bugs/1755132

Make the diagnose counters also appear as instruction counters.

Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Reviewed-by: Janosch Frank <frankja at linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david at redhat.com>
Reviewed-by: Cornelia Huck <cohuck at redhat.com>
(cherry picked from commit 866c138c32547b690e4cab3cd209c763508a95ab)
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 arch/s390/kvm/kvm-s390.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 1371dff..480cf47 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -118,12 +118,12 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 	{ "instruction_sigp_cpu_reset", VCPU_STAT(instruction_sigp_cpu_reset) },
 	{ "instruction_sigp_init_cpu_reset", VCPU_STAT(instruction_sigp_init_cpu_reset) },
 	{ "instruction_sigp_unknown", VCPU_STAT(instruction_sigp_unknown) },
-	{ "diagnose_10", VCPU_STAT(diagnose_10) },
-	{ "diagnose_44", VCPU_STAT(diagnose_44) },
-	{ "diagnose_9c", VCPU_STAT(diagnose_9c) },
-	{ "diagnose_258", VCPU_STAT(diagnose_258) },
-	{ "diagnose_308", VCPU_STAT(diagnose_308) },
-	{ "diagnose_500", VCPU_STAT(diagnose_500) },
+	{ "instruction_diag_10", VCPU_STAT(diagnose_10) },
+	{ "instruction_diag_44", VCPU_STAT(diagnose_44) },
+	{ "instruction_diag_9c", VCPU_STAT(diagnose_9c) },
+	{ "instruction_diag_258", VCPU_STAT(diagnose_258) },
+	{ "instruction_diag_308", VCPU_STAT(diagnose_308) },
+	{ "instruction_diag_500", VCPU_STAT(diagnose_500) },
 	{ NULL }
 };
 
-- 
2.7.4





More information about the kernel-team mailing list