From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScEzr-0006pn-8T for qemu-devel@nongnu.org; Wed, 06 Jun 2012 08:05:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScEzl-0001M9-CK for qemu-devel@nongnu.org; Wed, 06 Jun 2012 08:05:54 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:40349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScEzl-0001Kg-3n for qemu-devel@nongnu.org; Wed, 06 Jun 2012 08:05:49 -0400 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Jun 2012 13:05:43 +0100 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q56C5egp2248764 for ; Wed, 6 Jun 2012 13:05:40 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q56C5bNh001892 for ; Wed, 6 Jun 2012 06:05:39 -0600 From: Jens Freimann Date: Wed, 6 Jun 2012 14:05:18 +0200 Message-Id: <1338984323-21914-4-git-send-email-jfrei@de.ibm.com> In-Reply-To: <1338984323-21914-1-git-send-email-jfrei@de.ibm.com> References: <1338984323-21914-1-git-send-email-jfrei@de.ibm.com> Subject: [Qemu-devel] [PATCH 3/8] s390: make kvm_stat work on s390 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Cornelia Huck , Jens Freimann , Heinz Graalfs , qemu-devel From: Jens Freimann Add s390_exit_reasons so kvm_stat doesn't crash when called on s390. Look for 'vendor_id' in /proc/cpuinfo as well, instead of just for 'flags', so we can determine if we run on S390. Signed-off-by: Jens Freimann --- scripts/kvm/kvm_stat | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index 56d2bd7..e8d68f0 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -141,15 +141,39 @@ svm_exit_reasons = { 0x400: 'NPF', } +s390_exit_reasons = { + 0x000: 'UNKNOWN', + 0x001: 'EXCEPTION', + 0x002: 'IO', + 0x003: 'HYPERCALL', + 0x004: 'DEBUG', + 0x005: 'HLT', + 0x006: 'MMIO', + 0x007: 'IRQ_WINDOW_OPEN', + 0x008: 'SHUTDOWN', + 0x009: 'FAIL_ENTRY', + 0x010: 'INTR', + 0x011: 'SET_TPR', + 0x012: 'TPR_ACCESS', + 0x013: 'S390_SIEIC', + 0x014: 'S390_RESET', + 0x015: 'DCR', + 0x016: 'NMI', + 0x017: 'INTERNAL_ERROR', + 0x018: 'OSI', + 0x019: 'PAPR_HCALL', +} + vendor_exit_reasons = { 'vmx': vmx_exit_reasons, 'svm': svm_exit_reasons, + 'IBM/S390': s390_exit_reasons, } exit_reasons = None for line in file('/proc/cpuinfo').readlines(): - if line.startswith('flags'): + if line.startswith('flags') or line.startswith('vendor_id'): for flag in line.split(): if flag in vendor_exit_reasons: exit_reasons = vendor_exit_reasons[flag] -- 1.7.10.4