diff options
| author | Heiko Carstens | 2016-06-22 09:25:58 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-06-24 10:54:09 +0200 |
| commit | 0c28f0c8151a8ac41e12b672643a5beda82f09b4 (patch) | |
| tree | 06249af8595428b56abb07b3836b10580d6dd5bc /tests/expected/lscpu | |
| parent | lscpu: show static and dynamic MHz (s390) (diff) | |
| download | kernel-qcow2-util-linux-0c28f0c8151a8ac41e12b672643a5beda82f09b4.tar.gz kernel-qcow2-util-linux-0c28f0c8151a8ac41e12b672643a5beda82f09b4.tar.xz kernel-qcow2-util-linux-0c28f0c8151a8ac41e12b672643a5beda82f09b4.zip | |
lscpu: show machine type (s390)
Show also the machine type within the lscpu output. With the machine
type it is possible to identify the cpu generation and the supported
features.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'tests/expected/lscpu')
| -rw-r--r-- | tests/expected/lscpu/lscpu-s390-kvm | 1 | ||||
| -rw-r--r-- | tests/expected/lscpu/lscpu-s390-lpar | 1 | ||||
| -rw-r--r-- | tests/expected/lscpu/lscpu-s390-lpar-drawer | 1 | ||||
| -rw-r--r-- | tests/expected/lscpu/lscpu-s390-zvm | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/tests/expected/lscpu/lscpu-s390-kvm b/tests/expected/lscpu/lscpu-s390-kvm index 9632b055a..66d1c047c 100644 --- a/tests/expected/lscpu/lscpu-s390-kvm +++ b/tests/expected/lscpu/lscpu-s390-kvm @@ -6,6 +6,7 @@ Core(s) per socket: 1 Socket(s) per book: 1 Book(s): 3 Vendor ID: IBM/S390 +Machine type: 2817 BogoMIPS: 14367.00 Hypervisor: KVM/Linux Hypervisor vendor: KVM diff --git a/tests/expected/lscpu/lscpu-s390-lpar b/tests/expected/lscpu/lscpu-s390-lpar index a4265667f..9c8ac2c4f 100644 --- a/tests/expected/lscpu/lscpu-s390-lpar +++ b/tests/expected/lscpu/lscpu-s390-lpar @@ -7,6 +7,7 @@ Core(s) per socket: 4 Socket(s) per book: 6 Book(s): 4 Vendor ID: IBM/S390 +Machine type: 2817 BogoMIPS: 14367.00 Hypervisor: PR/SM Hypervisor vendor: IBM diff --git a/tests/expected/lscpu/lscpu-s390-lpar-drawer b/tests/expected/lscpu/lscpu-s390-lpar-drawer index 88fe1009e..587e7a6ed 100644 --- a/tests/expected/lscpu/lscpu-s390-lpar-drawer +++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer @@ -8,6 +8,7 @@ Book(s) per drawer: 2 Drawer(s): 4 NUMA node(s): 1 Vendor ID: IBM/S390 +Machine type: 2964 Model name: 0 CPU dynamic MHz: 5000 CPU static MHz: 5000 diff --git a/tests/expected/lscpu/lscpu-s390-zvm b/tests/expected/lscpu/lscpu-s390-zvm index 6cf24bf86..4cd6b8fa0 100644 --- a/tests/expected/lscpu/lscpu-s390-zvm +++ b/tests/expected/lscpu/lscpu-s390-zvm @@ -6,6 +6,7 @@ Core(s) per socket: 1 Socket(s) per book: 1 Book(s): 4 Vendor ID: IBM/S390 +Machine type: 2817 BogoMIPS: 14367.00 Hypervisor: z/VM 6.1.0 Hypervisor vendor: IBM |