diff options
| author | Ruediger Meier | 2016-03-16 13:18:18 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-03-16 14:17:33 +0100 |
| commit | c95e3889725389e9d7e24d29c2a71b015959575f (patch) | |
| tree | 568153b39a7973801416780129d9f0978e71e7db /tests/expected/lscpu | |
| parent | Revert "lscpu: keep lscpu usable on snapshots" (diff) | |
| download | kernel-qcow2-util-linux-c95e3889725389e9d7e24d29c2a71b015959575f.tar.gz kernel-qcow2-util-linux-c95e3889725389e9d7e24d29c2a71b015959575f.tar.xz kernel-qcow2-util-linux-c95e3889725389e9d7e24d29c2a71b015959575f.zip | |
lscpu: use cpu and revision tag if available
Avoid ifdef which does not work with --sysroot. Our existing test
dumps produce even better output now for ppc and sparc.
The logic moved to the printing section.
CC: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/expected/lscpu')
| -rw-r--r-- | tests/expected/lscpu/lscpu-ppc-qemu | 3 | ||||
| -rw-r--r-- | tests/expected/lscpu/lscpu-ppc64-POWER7 | 3 | ||||
| -rw-r--r-- | tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu | 3 | ||||
| -rw-r--r-- | tests/expected/lscpu/lscpu-sparc64 | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/tests/expected/lscpu/lscpu-ppc-qemu b/tests/expected/lscpu/lscpu-ppc-qemu index b3ea4a728..78b0b295f 100644 --- a/tests/expected/lscpu/lscpu-ppc-qemu +++ b/tests/expected/lscpu/lscpu-ppc-qemu @@ -3,7 +3,8 @@ On-line CPU(s) list: 0 Thread(s) per core: 1 Core(s) per socket: 1 Socket(s): 1 -Model: Power Macintosh +Model: 3.1 (pvr 0008 0301) +Model name: 740/750 BogoMIPS: 33.25 L1d cache: unknown size L1i cache: unknown size diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7 b/tests/expected/lscpu/lscpu-ppc64-POWER7 index 0d6c5ba2f..9a3c0c964 100644 --- a/tests/expected/lscpu/lscpu-ppc64-POWER7 +++ b/tests/expected/lscpu/lscpu-ppc64-POWER7 @@ -4,7 +4,8 @@ Thread(s) per core: 4 Core(s) per socket: 1 Socket(s): 4 NUMA node(s): 1 -Model: IBM,8233-E8B +Model: 2.1 (pvr 003f 0201) +Model name: POWER7 (architected), altivec supported L1d cache: 32K L1i cache: 32K NUMA node0 CPU(s): 0-15 diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu b/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu index e48735ec6..0aed12a1d 100644 --- a/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu +++ b/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu @@ -4,7 +4,8 @@ Thread(s) per core: 4 Core(s) per socket: 1 Socket(s): 16 NUMA node(s): 2 -Model: IBM,8231-E2B +Model: 2.1 (pvr 003f 0201) +Model name: POWER7 (architected), altivec supported Hypervisor vendor: pHyp Virtualization type: para L1d cache: 32K diff --git a/tests/expected/lscpu/lscpu-sparc64 b/tests/expected/lscpu/lscpu-sparc64 index 629b39964..aacaf1156 100644 --- a/tests/expected/lscpu/lscpu-sparc64 +++ b/tests/expected/lscpu/lscpu-sparc64 @@ -4,6 +4,7 @@ On-line CPU(s) list: 6,7,10,11,14,15 Thread(s) per core: 1 Core(s) per socket: 1 Socket(s): 6 +Model name: TI UltraSparc II (BlackBird) Flags: sun4u # The following is the parsable format, which can be fed to other |