From nobody Tue May 14 10:59:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1515757110445401.1521922468861; Fri, 12 Jan 2018 03:38:30 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 851D6C054C5F; Fri, 12 Jan 2018 11:38:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81EF475554; Fri, 12 Jan 2018 11:38:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 824BB4ED38; Fri, 12 Jan 2018 11:38:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0CBcNuI018439 for ; Fri, 12 Jan 2018 06:38:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0A8D75D6A6; Fri, 12 Jan 2018 11:38:23 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 037FB5D6A3 for ; Fri, 12 Jan 2018 11:38:20 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EBE6518C368 for ; Fri, 12 Jan 2018 11:38:13 +0000 (UTC) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0CBYu1p022106 for ; Fri, 12 Jan 2018 06:38:13 -0500 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fesdqfcy2-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 12 Jan 2018 06:38:13 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 12 Jan 2018 11:38:10 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 12 Jan 2018 11:38:09 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0CBc8Gm35782892; Fri, 12 Jan 2018 11:38:08 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B9A6AE055; Fri, 12 Jan 2018 11:30:05 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E0E6FAE051; Fri, 12 Jan 2018 11:30:04 +0000 (GMT) Received: from s38lp19.boeblingen.de.ibm.com (unknown [9.152.161.19]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 12 Jan 2018 11:30:04 +0000 (GMT) From: Bjoern Walk To: libvir-list@redhat.com Date: Fri, 12 Jan 2018 12:38:01 +0100 In-Reply-To: <20180112113802.220469-1-bwalk@linux.vnet.ibm.com> References: <20180112113802.220469-1-bwalk@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18011211-0020-0000-0000-000003E9E62E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18011211-0021-0000-0000-0000427C116D Message-Id: <20180112113802.220469-2-bwalk@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-12_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801120156 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 12 Jan 2018 11:38:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 12 Jan 2018 11:38:19 +0000 (UTC) for IP:'148.163.156.1' DOMAIN:'mx0a-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'bwalk@linux.vnet.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2) 148.163.156.1 mx0a-001b2d01.pphosted.com 148.163.156.1 mx0a-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Bjoern Walk Subject: [libvirt] [PATCH v2 1/2] util: virsysinfo: parse frequency information on S390 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 12 Jan 2018 11:38:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Let's also parse the available processor frequency information on S390 so that it can be utilized by virsh sysinfo: # virsh sysinfo ... 2964 IBM/S390 00 5000 145F07 ... Reviewed-by: Marc Hartmayer Reviewed-by: Boris Fiuczynski Signed-off-by: Bjoern Walk --- src/util/virsysinfo.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index ab81b1f7..dc309a7c 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -34,6 +34,7 @@ #include "virsysinfo.h" #include "viralloc.h" #include "vircommand.h" +#include "virlog.h" #include "virfile.h" #include "virstring.h" =20 @@ -42,6 +43,7 @@ =20 #define VIR_FROM_THIS VIR_FROM_SYSINFO =20 +VIR_LOG_INIT("util.sysinfo"); =20 VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST, "smbios"); @@ -495,11 +497,12 @@ virSysinfoParseS390Processor(const char *base, virSys= infoDefPtr ret) char *tmp_base; char *manufacturer =3D NULL; char *procline =3D NULL; + char *ncpu =3D NULL; int result =3D -1; virSysinfoProcessorDefPtr processor; =20 if (!(tmp_base =3D virSysinfoParseS390Line(base, "vendor_id", &manufac= turer))) - goto cleanup; + goto error; =20 /* Find processor N: line and gather the processor manufacturer, version, serial number, and family */ @@ -507,10 +510,10 @@ virSysinfoParseS390Processor(const char *base, virSys= infoDefPtr ret) && (tmp_base =3D virSysinfoParseS390Line(tmp_base, "processor ", &procline))) { if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) - goto cleanup; + goto error; processor =3D &ret->processor[ret->nprocessor - 1]; if (VIR_STRDUP(processor->processor_manufacturer, manufacturer) < = 0) - goto cleanup; + goto error; if (!virSysinfoParseS390Delimited(procline, "version", &processor->processor_version, '=3D', ',') || @@ -520,15 +523,43 @@ virSysinfoParseS390Processor(const char *base, virSys= infoDefPtr ret) !virSysinfoParseS390Delimited(procline, "machine", &processor->processor_family, '=3D', '\n')) - goto cleanup; + goto error; =20 VIR_FREE(procline); } - result =3D 0; + + /* now, for each processor found, extract the frequency information */ + tmp_base =3D (char *) base; + + while ((tmp_base =3D strstr(tmp_base, "cpu number")) && + (tmp_base =3D virSysinfoParseS390Line(tmp_base, "cpu number", &= ncpu))) { + unsigned int n; + char *mhz =3D NULL; + + if (virStrToLong_uip(ncpu, NULL, 10, &n) < 0) + goto error; + + if (n >=3D ret->nprocessor) { + VIR_DEBUG("CPU number '%d' out of range", n); + goto cleanup; + } + + if (!(tmp_base =3D strstr(tmp_base, "cpu MHz static")) || + !virSysinfoParseS390Line(tmp_base, "cpu MHz static", &mhz)) + goto cleanup; + + ret->processor[n].processor_max_speed =3D mhz; + + VIR_FREE(ncpu); + } =20 cleanup: + result =3D 0; + + error: VIR_FREE(manufacturer); VIR_FREE(procline); + VIR_FREE(ncpu); return result; } =20 --=20 2.13.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 14 10:59:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 151575712144347.38786109960529; Fri, 12 Jan 2018 03:38:41 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D70D749038; Fri, 12 Jan 2018 11:38:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 896D5C9122; Fri, 12 Jan 2018 11:38:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A704A18033D9; Fri, 12 Jan 2018 11:38:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0CBcPGX018450 for ; Fri, 12 Jan 2018 06:38:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id DBD3F6017B; Fri, 12 Jan 2018 11:38:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D647D1347B for ; Fri, 12 Jan 2018 11:38:23 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A93D8C056781 for ; Fri, 12 Jan 2018 11:38:15 +0000 (UTC) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0CBXw4G053922 for ; Fri, 12 Jan 2018 06:38:15 -0500 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 2fetjvveb7-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 12 Jan 2018 06:38:14 -0500 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 12 Jan 2018 11:38:12 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 12 Jan 2018 11:38:10 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0CBcAgL45154520; Fri, 12 Jan 2018 11:38:10 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 39827AE057; Fri, 12 Jan 2018 11:30:06 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 15BE0AE045; Fri, 12 Jan 2018 11:30:06 +0000 (GMT) Received: from s38lp19.boeblingen.de.ibm.com (unknown [9.152.161.19]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 12 Jan 2018 11:30:06 +0000 (GMT) From: Bjoern Walk To: libvir-list@redhat.com Date: Fri, 12 Jan 2018 12:38:02 +0100 In-Reply-To: <20180112113802.220469-1-bwalk@linux.vnet.ibm.com> References: <20180112113802.220469-1-bwalk@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18011211-0012-0000-0000-000005A2F496 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18011211-0013-0000-0000-0000191E5BBD Message-Id: <20180112113802.220469-3-bwalk@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-12_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801120156 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 12 Jan 2018 11:38:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 12 Jan 2018 11:38:15 +0000 (UTC) for IP:'148.163.158.5' DOMAIN:'mx0b-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'bwalk@linux.vnet.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2) 148.163.158.5 mx0b-001b2d01.pphosted.com 148.163.158.5 mx0b-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Bjoern Walk Subject: [libvirt] [PATCH v2 2/2] tests: sysinfotest: add new test case for S390 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 12 Jan 2018 11:38:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Let's add a test case for S390 with CPU frequency information available. Test data is sampled from an IBM z13 system running kernel 4.14 on LPAR. Reviewed-by: Boris Fiuczynski Signed-off-by: Bjoern Walk Reviewed-by: John Ferlan --- tests/sysinfodata/s390-freqcpuinfo.data | 52 +++++++++ tests/sysinfodata/s390-freqsysinfo.data | 173 ++++++++++++++++++++++++++= ++++ tests/sysinfodata/s390-freqsysinfo.expect | 63 +++++++++++ tests/sysinfotest.c | 1 + 4 files changed, 289 insertions(+) create mode 100644 tests/sysinfodata/s390-freqcpuinfo.data create mode 100644 tests/sysinfodata/s390-freqsysinfo.data create mode 100644 tests/sysinfodata/s390-freqsysinfo.expect diff --git a/tests/sysinfodata/s390-freqcpuinfo.data b/tests/sysinfodata/s3= 90-freqcpuinfo.data new file mode 100644 index 00000000..0edc371d --- /dev/null +++ b/tests/sysinfodata/s390-freqcpuinfo.data @@ -0,0 +1,52 @@ +vendor_id : IBM/S390 +# processors : 8 +bogomips per cpu: 20325.00 +max thread id : 1 +features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx= sie=20 +facilities : 0 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22= 23 24 25 26 27 28 30 31 32 33 34 35 36 37 40 41 42 43 44 45 46 47 48 49 50= 51 52 53 55 57 64 65 66 67 68 69 70 71 72 73 75 76 77 78 80 128 129 131 13= 2 142 143 +cache0 : level=3D1 type=3DData scope=3DPrivate size=3D128K line_s= ize=3D256 associativity=3D8 +cache1 : level=3D1 type=3DInstruction scope=3DPrivate size=3D96K = line_size=3D256 associativity=3D6 +cache2 : level=3D2 type=3DData scope=3DPrivate size=3D2048K line_= size=3D256 associativity=3D8 +cache3 : level=3D2 type=3DInstruction scope=3DPrivate size=3D2048= K line_size=3D256 associativity=3D8 +cache4 : level=3D3 type=3DUnified scope=3DShared size=3D65536K li= ne_size=3D256 associativity=3D16 +cache5 : level=3D4 type=3DUnified scope=3DShared size=3D491520K l= ine_size=3D256 associativity=3D30 +processor 0: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 1: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 2: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 3: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 4: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 5: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 6: version =3D 00, identification =3D 145F07, machine =3D 2964 +processor 7: version =3D 00, identification =3D 145F07, machine =3D 2964 + +cpu number : 0 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 1 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 2 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 3 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 4 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 5 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 6 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 7 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 diff --git a/tests/sysinfodata/s390-freqsysinfo.data b/tests/sysinfodata/s3= 90-freqsysinfo.data new file mode 100644 index 00000000..1941ef0b --- /dev/null +++ b/tests/sysinfodata/s390-freqsysinfo.data @@ -0,0 +1,173 @@ +Manufacturer: IBM +Type: 2964 +Model: 704 NC9 +Sequence Code: 0000000000085F07 +Plant: 02 +Model Capacity: 704 00000740 +Model Perm. Capacity: 704 00000740 +Model Temp. Capacity: 704 00000740 +Nominal Cap. Rating: 00000740 +Nominal Perm. Rating: 00000740 +Nominal Temp. Rating: 00000740 +Capacity Adj. Ind.: 100 +Capacity Ch. Reason: 0 +Capacity Transient: 0 +Type 1 Percentage: 0 +Type 2 Percentage: 0 +Type 3 Percentage: 0 +Type 4 Percentage: 0 +Type 5 Percentage: 0 + +CPU Topology HW: 0 0 4 2 3 8 +CPU Topology SW: 0 0 4 2 3 8 +CPUs Total: 129 +CPUs Configured: 4 +CPUs Standby: 0 +CPUs Reserved: 125 +CPUs G-MTID: 0 +CPUs S-MTID: 1 +Capability: 492 +Nominal Capability: 492 +Secondary Capability: 492 +Adjustment 02-way: 61470 +Adjustment 03-way: 59694 +Adjustment 04-way: 58336 +Adjustment 05-way: 56860 +Adjustment 06-way: 55918 +Adjustment 07-way: 54956 +Adjustment 08-way: 53949 +Adjustment 09-way: 52689 +Adjustment 10-way: 51635 +Adjustment 11-way: 50577 +Adjustment 12-way: 49584 +Adjustment 13-way: 48821 +Adjustment 14-way: 47979 +Adjustment 15-way: 47170 +Adjustment 16-way: 46270 +Adjustment 17-way: 45730 +Adjustment 18-way: 45292 +Adjustment 19-way: 44737 +Adjustment 20-way: 44517 +Adjustment 21-way: 44019 +Adjustment 22-way: 43770 +Adjustment 23-way: 43478 +Adjustment 24-way: 43216 +Adjustment 25-way: 42964 +Adjustment 26-way: 42763 +Adjustment 27-way: 42529 +Adjustment 28-way: 42172 +Adjustment 29-way: 41916 +Adjustment 30-way: 41659 +Adjustment 31-way: 41382 +Adjustment 32-way: 41165 +Adjustment 33-way: 40903 +Adjustment 34-way: 40640 +Adjustment 35-way: 40477 +Adjustment 36-way: 40314 +Adjustment 37-way: 40149 +Adjustment 38-way: 39898 +Adjustment 39-way: 39707 +Adjustment 40-way: 39443 +Adjustment 41-way: 39248 +Adjustment 42-way: 39149 +Adjustment 43-way: 38934 +Adjustment 44-way: 38809 +Adjustment 45-way: 38633 +Adjustment 46-way: 38404 +Adjustment 47-way: 38206 +Adjustment 48-way: 38092 +Adjustment 49-way: 37997 +Adjustment 50-way: 37836 +Adjustment 51-way: 37660 +Adjustment 52-way: 37550 +Adjustment 53-way: 37440 +Adjustment 54-way: 37347 +Adjustment 55-way: 37260 +Adjustment 56-way: 37142 +Adjustment 57-way: 37047 +Adjustment 58-way: 36963 +Adjustment 59-way: 36879 +Adjustment 60-way: 36755 +Adjustment 61-way: 36673 +Adjustment 62-way: 36606 +Adjustment 63-way: 36505 +Adjustment 64-way: 36404 +Adjustment 65-way: 36305 +Adjustment 66-way: 36185 +Adjustment 67-way: 36079 +Adjustment 68-way: 36020 +Adjustment 69-way: 35905 +Adjustment 70-way: 35800 +Adjustment 71-way: 35705 +Adjustment 72-way: 35597 +Adjustment 73-way: 35532 +Adjustment 74-way: 35429 +Adjustment 75-way: 35333 +Adjustment 76-way: 35232 +Adjustment 77-way: 35170 +Adjustment 78-way: 35080 +Adjustment 79-way: 34984 +Adjustment 80-way: 34925 +Adjustment 81-way: 34831 +Adjustment 82-way: 34739 +Adjustment 83-way: 34647 +Adjustment 84-way: 34590 +Adjustment 85-way: 34500 +Adjustment 86-way: 34411 +Adjustment 87-way: 34356 +Adjustment 88-way: 34302 +Adjustment 89-way: 34282 +Adjustment 90-way: 34229 +Adjustment 91-way: 34176 +Adjustment 92-way: 34124 +Adjustment 93-way: 34073 +Adjustment 94-way: 34055 +Adjustment 95-way: 34004 +Adjustment 96-way: 33987 +Adjustment 97-way: 33937 +Adjustment 98-way: 33922 +Adjustment 99-way: 33873 +Adjustment 100-way: 33826 +Adjustment 101-way: 33812 +Adjustment 102-way: 33766 +Adjustment 103-way: 33753 +Adjustment 104-way: 33675 +Adjustment 105-way: 33599 +Adjustment 106-way: 33523 +Adjustment 107-way: 33448 +Adjustment 108-way: 33374 +Adjustment 109-way: 33300 +Adjustment 110-way: 33227 +Adjustment 111-way: 33155 +Adjustment 112-way: 33083 +Adjustment 113-way: 33012 +Adjustment 114-way: 32941 +Adjustment 115-way: 32871 +Adjustment 116-way: 32802 +Adjustment 117-way: 32733 +Adjustment 118-way: 32665 +Adjustment 119-way: 32597 +Adjustment 120-way: 32529 +Adjustment 121-way: 32462 +Adjustment 122-way: 32396 +Adjustment 123-way: 32330 +Adjustment 124-way: 32265 +Adjustment 125-way: 32200 +Adjustment 126-way: 32136 +Adjustment 127-way: 32072 +Adjustment 128-way: 32008 +Adjustment 129-way: 31945 + +LPAR Number: 20 +LPAR Characteristics: Shared +LPAR Name: VIRLP01 +LPAR Adjustment: 32 +LPAR CPUs Total: 4 +LPAR CPUs Configured: 4 +LPAR CPUs Standby: 0 +LPAR CPUs Reserved: 0 +LPAR CPUs Dedicated: 0 +LPAR CPUs Shared: 4 +LPAR CPUs G-MTID: 0 +LPAR CPUs S-MTID: 1 +LPAR CPUs PS-MTID: 1 diff --git a/tests/sysinfodata/s390-freqsysinfo.expect b/tests/sysinfodata/= s390-freqsysinfo.expect new file mode 100644 index 00000000..577c7a28 --- /dev/null +++ b/tests/sysinfodata/s390-freqsysinfo.expect @@ -0,0 +1,63 @@ + + + IBM + 0000000000085F07 + 2964 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + + 2964 + IBM/S390 + 00 + 5000 + 145F07 + + diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 2b328281..a61da017 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -137,6 +137,7 @@ mymain(void) int ret =3D EXIT_SUCCESS; =20 TEST("s390", virSysinfoReadS390); + TEST("s390-freq", virSysinfoReadS390); TEST("ppc", virSysinfoReadPPC); TEST_FULL("x86", virSysinfoReadX86, "/sysinfodata/dmidecode.sh"); TEST("arm", virSysinfoReadARM); --=20 2.13.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list