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