fe1ca8
From b30f84e240bd60a23508797e33a4777cbaa50949 Mon Sep 17 00:00:00 2001
fe1ca8
From: Karel Zak <kzak@redhat.com>
fe1ca8
Date: Tue, 17 Dec 2019 10:53:47 +0100
fe1ca8
Subject: [PATCH] tests: update lscpu test for RHEL8
fe1ca8
fe1ca8
The test is originally from upstream (~v2.35), but RHEL-8 uses older
fe1ca8
version with a little different output -- RHEL-8 has no vulnerability
fe1ca8
fields and it counts cache sizes  in different way.
fe1ca8
fe1ca8
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1739443
fe1ca8
Signed-off-by: Karel Zak <kzak@redhat.com>
fe1ca8
---
fe1ca8
 tests/expected/lscpu/lscpu-s390-nested-virt | 57 ++++++++++-----------
fe1ca8
 1 file changed, 26 insertions(+), 31 deletions(-)
fe1ca8
fe1ca8
diff --git a/tests/expected/lscpu/lscpu-s390-nested-virt b/tests/expected/lscpu/lscpu-s390-nested-virt
fe1ca8
index 2665fd8dc..a6ab04f0b 100644
fe1ca8
--- a/tests/expected/lscpu/lscpu-s390-nested-virt
fe1ca8
+++ b/tests/expected/lscpu/lscpu-s390-nested-virt
fe1ca8
@@ -1,34 +1,29 @@
fe1ca8
-CPU op-mode(s):                  32-bit, 64-bit
fe1ca8
-CPU(s):                          2
fe1ca8
-On-line CPU(s) list:             0,1
fe1ca8
-Thread(s) per core:              1
fe1ca8
-Core(s) per socket:              1
fe1ca8
-Socket(s) per book:              1
fe1ca8
-Book(s) per drawer:              1
fe1ca8
-Drawer(s):                       2
fe1ca8
-NUMA node(s):                    1
fe1ca8
-Vendor ID:                       IBM/S390
fe1ca8
-Machine type:                    2964
fe1ca8
-CPU dynamic MHz:                 5000
fe1ca8
-CPU static MHz:                  5000
fe1ca8
-BogoMIPS:                        3033.00
fe1ca8
-Hypervisor:                      KVM/Linux
fe1ca8
-Hypervisor vendor:               KVM
fe1ca8
-Virtualization type:             full
fe1ca8
-Dispatching mode:                horizontal
fe1ca8
-L1d cache:                       256 KiB
fe1ca8
-L1i cache:                       192 KiB
fe1ca8
-L2d cache:                       4 MiB
fe1ca8
-L2i cache:                       4 MiB
fe1ca8
-L3 cache:                        64 MiB
fe1ca8
-L4 cache:                        480 MiB
fe1ca8
-NUMA node0 CPU(s):               0,1
fe1ca8
-Vulnerability L1tf:              Not affected
fe1ca8
-Vulnerability Meltdown:          Not affected
fe1ca8
-Vulnerability Spec store bypass: Not affected
fe1ca8
-Vulnerability Spectre v1:        Mitigation; __user pointer sanitization
fe1ca8
-Vulnerability Spectre v2:        Mitigation; execute trampolines
fe1ca8
-Flags:                           esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx
fe1ca8
+CPU op-mode(s):      32-bit, 64-bit
fe1ca8
+CPU(s):              2
fe1ca8
+On-line CPU(s) list: 0,1
fe1ca8
+Thread(s) per core:  1
fe1ca8
+Core(s) per socket:  1
fe1ca8
+Socket(s) per book:  1
fe1ca8
+Book(s) per drawer:  1
fe1ca8
+Drawer(s):           2
fe1ca8
+NUMA node(s):        1
fe1ca8
+Vendor ID:           IBM/S390
fe1ca8
+Machine type:        2964
fe1ca8
+CPU dynamic MHz:     5000
fe1ca8
+CPU static MHz:      5000
fe1ca8
+BogoMIPS:            3033.00
fe1ca8
+Hypervisor:          KVM/Linux
fe1ca8
+Hypervisor vendor:   KVM
fe1ca8
+Virtualization type: full
fe1ca8
+Dispatching mode:    horizontal
fe1ca8
+L1d cache:           128K
fe1ca8
+L1i cache:           96K
fe1ca8
+L2d cache:           2048K
fe1ca8
+L2i cache:           2048K
fe1ca8
+L3 cache:            65536K
fe1ca8
+L4 cache:            491520K
fe1ca8
+NUMA node0 CPU(s):   0,1
fe1ca8
+Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx
fe1ca8
 
fe1ca8
 # The following is the parsable format, which can be fed to other
fe1ca8
 # programs. Each different item in every column has an unique ID
fe1ca8
-- 
fe1ca8
2.21.0
fe1ca8