Adding upstream version 2.36.1.upstream/2.36.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 45 insertions, 0 deletions

diff --git a/tests/expected/lscpu/lscpu-s390-nested-virt b/tests/expected/lscpu/lscpu-s390-nested-virt
new file mode 100644
index 0000000..2665fd8
--- /dev/null
+++ b/tests/expected/lscpu/lscpu-s390-nested-virt
@@ -0,0 +1,45 @@
+CPU op-mode(s):                  32-bit, 64-bit
+CPU(s):                          2
+On-line CPU(s) list:             0,1
+Thread(s) per core:              1
+Core(s) per socket:              1
+Socket(s) per book:              1
+Book(s) per drawer:              1
+Drawer(s):                       2
+NUMA node(s):                    1
+Vendor ID:                       IBM/S390
+Machine type:                    2964
+CPU dynamic MHz:                 5000
+CPU static MHz:                  5000
+BogoMIPS:                        3033.00
+Hypervisor:                      KVM/Linux
+Hypervisor vendor:               KVM
+Virtualization type:             full
+Dispatching mode:                horizontal
+L1d cache:                       256 KiB
+L1i cache:                       192 KiB
+L2d cache:                       4 MiB
+L2i cache:                       4 MiB
+L3 cache:                        64 MiB
+L4 cache:                        480 MiB
+NUMA node0 CPU(s):               0,1
+Vulnerability L1tf:              Not affected
+Vulnerability Meltdown:          Not affected
+Vulnerability Spec store bypass: Not affected
+Vulnerability Spectre v1:        Mitigation; __user pointer sanitization
+Vulnerability Spectre v2:        Mitigation; execute trampolines
+Flags:                           esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx
+
+# The following is the parsable format, which can be fed to other
+# programs. Each different item in every column has an unique ID
+# starting from zero.
+# CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i
+0,0,0,0,,0,0,0,0
+1,1,1,0,,1,1,1,1
+
+# The following is the parsable format, which can be fed to other
+# programs. Each different item in every column has an unique ID
+# starting from zero.
+# CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i
+0,0,0,0,,0,0,0,0
+1,1,1,0,,1,1,1,1