From b5b67b32d83e2d5d2522f6708357a689c1542280 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 20 2022 12:14:42 +0000 Subject: import virt-what-1.25-1.el8 --- diff --git a/.gitignore b/.gitignore index 5c55c81..05fb7c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/virt-what-1.18.tar.gz +SOURCES/virt-what-1.25.tar.gz diff --git a/.virt-what.metadata b/.virt-what.metadata index 6ee78eb..a8fd8a8 100644 --- a/.virt-what.metadata +++ b/.virt-what.metadata @@ -1 +1 @@ -cf60480c17be5350835a0b23dc82012ec711eea1 SOURCES/virt-what-1.18.tar.gz +dcbec6a76eddadd63b5139e296e28f600201c37f SOURCES/virt-what-1.25.tar.gz diff --git a/SOURCES/0001-Missing-have_cpuinfo-check.patch b/SOURCES/0001-Missing-have_cpuinfo-check.patch deleted file mode 100644 index 2f4008a..0000000 --- a/SOURCES/0001-Missing-have_cpuinfo-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From eefc1e7e3dd8fb422baf0f13aec1df9880541b83 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse -Date: Thu, 10 Aug 2017 08:44:01 +0100 -Subject: [PATCH 01/36] Missing have_cpuinfo check. - ---- - virt-what.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virt-what.in b/virt-what.in -index 8c27b11..9050035 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -308,7 +308,7 @@ if ! "$skip_qemu_kvm"; then - # option, since /proc/cpuinfo will not contain the QEMU - # string. QEMU 2.10 added a new CPUID leaf, so this - # problem only triggered for older QEMU -- if grep -q 'QEMU' "${root}/proc/cpuinfo"; then -+ if have_cpuinfo && grep -q 'QEMU' "${root}/proc/cpuinfo"; then - echo qemu - fi - fi --- -2.31.1 - diff --git a/SOURCES/0002-Remove-bashisms.patch b/SOURCES/0002-Remove-bashisms.patch deleted file mode 100644 index 520c5b8..0000000 --- a/SOURCES/0002-Remove-bashisms.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9d90704a05dee7704470eff818a1c44aeef6c880 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Fri, 4 Aug 2017 12:02:08 -0300 -Subject: [PATCH 02/36] Remove bashisms - -Use [ instead of [[ so we fall back to test if necessary: - - http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html - -Gbp-Pq: Name Remove-bashisms.patch ---- - virt-what.in | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/virt-what.in b/virt-what.in -index 9050035..a05e0db 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -360,20 +360,20 @@ if [ "$cpuid" = "OpenBSDVMM58" ]; then - fi - - # Check for LDoms --if [[ "$arch" == sparc* && -e ${root}/dev/mdesc ]]; then -+if [ "${arch#sparc}" != "$arch" ] && [ -e "${root}/dev/mdesc" ]; then - echo ldoms -- if [[ -d ${root}/sys/class/vlds/ctrl && \ -- -d ${root}/sys/class/vlds/sp ]]; then -+ if [ -d "${root}/sys/class/vlds/ctrl" ] && \ -+ [ -d "${root}/sys/class/vlds/sp" ]; then - echo ldoms-control - else - echo ldoms-guest - fi - MDPROP="${root}/usr/lib/ldoms/mdprop.py" -- if [[ -x ${MDPROP} ]]; then -- if [[ -n $($MDPROP -v iodevice device-type=pciex) ]]; then -+ if [ -x "${MDPROP}" ]; then -+ if [ -n "$($MDPROP -v iodevice device-type=pciex)" ]; then - echo ldoms-root - echo ldoms-io -- elif [[ -n $($MDPROP -v iov-device vf-id=0) ]]; then -+ elif [ -n "$($MDPROP -v iov-device vf-id=0)" ]; then - echo ldoms-io - fi - fi --- -2.31.1 - diff --git a/SOURCES/0003-As-xen-pv-guest-can-access-cpuid-from-Intel-CPUs-sta.patch b/SOURCES/0003-As-xen-pv-guest-can-access-cpuid-from-Intel-CPUs-sta.patch deleted file mode 100644 index bacedc8..0000000 --- a/SOURCES/0003-As-xen-pv-guest-can-access-cpuid-from-Intel-CPUs-sta.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a821dc9961d457c086fffcc16a911cb6f9f8659a Mon Sep 17 00:00:00 2001 -From: xiliang -Date: Sun, 18 Jun 2017 00:33:28 +0800 -Subject: [PATCH 03/36] As xen pv guest can access cpuid from Intel CPUs - started IvyBridge onwards have CPUID Faulting, added one more check in - virt-what. - ---- - virt-what.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/virt-what.in b/virt-what.in -index a05e0db..247348e 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -1,6 +1,6 @@ - #!/bin/sh - - # @configure_input@ --# Copyright (C) 2008-2015 Red Hat Inc. -+# Copyright (C) 2008-2017 Red Hat Inc. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -223,7 +223,8 @@ fi - - # Check for Xen. - --if [ "$cpuid" = "XenVMMXenVMM" ]; then -+if [ "$cpuid" = "XenVMMXenVMM" ] && -+ ! echo "$dmi" | grep -q 'No SMBIOS nor DMI entry point found, sorry'; then - echo xen; echo xen-hvm - # Check for AWS - if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then --- -2.31.1 - diff --git a/SOURCES/0004-Recognize-ppc64le-little-endian-virtualization-RHBZ-.patch b/SOURCES/0004-Recognize-ppc64le-little-endian-virtualization-RHBZ-.patch deleted file mode 100644 index 710b365..0000000 --- a/SOURCES/0004-Recognize-ppc64le-little-endian-virtualization-RHBZ-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7db94c8fe63f2c7ec3ac27cc5ff54ec1e1686aeb Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 17 Oct 2017 14:47:09 +0100 -Subject: [PATCH 04/36] Recognize ppc64le (little endian) virtualization - (RHBZ#1147876). - -Tested by Laurent Vivier, see: -https://bugzilla.redhat.com/show_bug.cgi?id=1147876#c35 & ff. ---- - virt-what.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virt-what.in b/virt-what.in -index 247348e..29b7b0d 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -339,7 +339,7 @@ fi - # example /proc/ppc64/lparcfg systemtype line - # system_type=IBM pSeries (emulated by qemu) - --if [ "$arch" = "ppc64" ]; then -+if [ "$arch" = "ppc64" ] || [ "$arch" = "ppc64le" ] ; then - if have_cpuinfo && grep -q 'platform.**pSeries' "${root}/proc/cpuinfo"; then - if grep -q 'model.*emulated by qemu' "${root}/proc/cpuinfo"; then - echo ibm_power-kvm --- -2.31.1 - diff --git a/SOURCES/0005-Determine-architecture-via-uname-m.patch b/SOURCES/0005-Determine-architecture-via-uname-m.patch deleted file mode 100644 index 181016a..0000000 --- a/SOURCES/0005-Determine-architecture-via-uname-m.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 52870e8a264653d7921e8a4edff56d4b050614d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Sat, 27 Jan 2018 13:11:36 +0100 -Subject: [PATCH 05/36] Determine architecture via 'uname -m' - -'uname -p' only gives unknown on x86_64, i386, arm6l (rpi) and aarch64 -(scaleways). ---- - virt-what.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/virt-what.in b/virt-what.in -index 29b7b0d..2011ff4 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -102,9 +102,9 @@ cpuid=$(virt-what-cpuid-helper) - dmi=$(LANG=C dmidecode 2>&1) - - # Architecture. --# Note for the purpose of testing, we only call uname with -p option. -+# Note for the purpose of testing, we only call uname with -m option. - --arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') -+arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') - - # Check for VMware. - # cpuid check added by Chetan Loke. --- -2.31.1 - diff --git a/SOURCES/0006-Allow-using-sysctl-for-example-when-proc-isn-t-avail.patch b/SOURCES/0006-Allow-using-sysctl-for-example-when-proc-isn-t-avail.patch deleted file mode 100644 index b9ef548..0000000 --- a/SOURCES/0006-Allow-using-sysctl-for-example-when-proc-isn-t-avail.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d7fd8a7843030d2b1719353edfcd49dba3000122 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse -Date: Wed, 25 Apr 2018 16:41:32 +0200 -Subject: [PATCH 06/36] Allow using sysctl, for example when /proc isn't - available - ---- - virt-what.in | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/virt-what.in b/virt-what.in -index 2011ff4..d037a99 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -38,6 +38,13 @@ have_cpuinfo () { - test -e "${root}/proc/cpuinfo" - } - -+use_sysctl() { -+ # Lacking /proc, on some systems sysctl can be used instead. -+ OS=$(uname) || fail "failed to get operating system name" -+ -+ [ "$OS" == "OpenBSD" ] -+} -+ - fail () { - echo "virt-what: $1" >&2 - exit 1 -@@ -304,6 +311,12 @@ if ! "$skip_qemu_kvm"; then - # We are running as a spapr KVM guest on ppc64 - echo kvm - skip_lkvm=true -+ elif use_sysctl; then -+ # SmartOS KVM -+ product=$(sysctl -n hw.product) -+ if echo "$product" | grep -q 'SmartDC HVM'; then -+ echo kvm -+ fi - else - # This is known to fail for qemu with the explicit -cpu - # option, since /proc/cpuinfo will not contain the QEMU --- -2.31.1 - diff --git a/SOURCES/0007-Replace-with-since-the-former-is-a-bash-ism.patch b/SOURCES/0007-Replace-with-since-the-former-is-a-bash-ism.patch deleted file mode 100644 index 63f0fd4..0000000 --- a/SOURCES/0007-Replace-with-since-the-former-is-a-bash-ism.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5efe9f7a58cd0cdc6f4c279c7f0a69e57fbda56f Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 28 Aug 2018 18:32:41 +0100 -Subject: [PATCH 07/36] Replace == with = since the former is a bash-ism. - -Thanks: Eric Blake. - -Fixes commit d7fd8a7843030d2b1719353edfcd49dba3000122. ---- - virt-what.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virt-what.in b/virt-what.in -index d037a99..a2f8f19 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -42,7 +42,7 @@ use_sysctl() { - # Lacking /proc, on some systems sysctl can be used instead. - OS=$(uname) || fail "failed to get operating system name" - -- [ "$OS" == "OpenBSD" ] -+ [ "$OS" = "OpenBSD" ] - } - - fail () { --- -2.31.1 - diff --git a/SOURCES/0008-aws-Detect-AWS-from-dmidecode-information.patch b/SOURCES/0008-aws-Detect-AWS-from-dmidecode-information.patch deleted file mode 100644 index 1e12971..0000000 --- a/SOURCES/0008-aws-Detect-AWS-from-dmidecode-information.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 147c648e950ef45b7a5b7b3e8cb30b89c435593b Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Oct 2018 15:04:24 +0000 -Subject: [PATCH 08/36] aws: Detect AWS from dmidecode information. - -Move the AWS detection out from under Xen. AWS runs on KVM and -baremetal these days. The dmidecode information for KVM and baremetal -is a little bit different so we also need to adjust the test for that -case. - -Typical SMBIOS info for Xen: - -BIOS Information - Vendor: Xen - Version: 4.2.amazon - -Typical SMBIOS info for KVM and baremetal: - -BIOS Information - Vendor: Amazon EC2 - Version: 1.0 - -Thanks: Vitaly Kuznetsov, Jon Masters. ---- - virt-what.in | 13 +++++++++---- - virt-what.pod | 8 ++++++-- - 2 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/virt-what.in b/virt-what.in -index a2f8f19..f685461 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -233,10 +233,6 @@ fi - if [ "$cpuid" = "XenVMMXenVMM" ] && - ! echo "$dmi" | grep -q 'No SMBIOS nor DMI entry point found, sorry'; then - echo xen; echo xen-hvm -- # Check for AWS -- if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then -- echo aws -- fi - skip_qemu_kvm=true - elif [ -d "${root}/proc/xen" ]; then - echo xen -@@ -392,3 +388,12 @@ if [ "${arch#sparc}" != "$arch" ] && [ -e "${root}/dev/mdesc" ]; then - fi - fi - fi -+ -+# Check for AWS. -+# AWS on Xen. -+if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then -+ echo aws -+# AWS on baremetal or KVM. -+elif echo "$dmi" | grep -q 'Vendor: Amazon EC2'; then -+ echo aws -+fi -diff --git a/virt-what.pod b/virt-what.pod -index ebfc190..5a0bdfc 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -27,9 +27,13 @@ don't know about or cannot detect. - - =item B - --Amazon Web Services cloud guest. -+Amazon Web Services. - --Status: contributed by Qi Guo. -+Note that virt-what will print this fact for baremetal AWS instances, -+which you might not consider to be true virtualization. In this case -+other facts (eg. C or C) would I be present. -+ -+Status: contributed by Qi Guo, Vitaly Kuznetsov, confirmed by RWMJ. - - =item B - --- -2.31.1 - diff --git a/SOURCES/0009-tests-Fix-tests-when-run-on-AWS.patch b/SOURCES/0009-tests-Fix-tests-when-run-on-AWS.patch deleted file mode 100644 index e7bff67..0000000 --- a/SOURCES/0009-tests-Fix-tests-when-run-on-AWS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4bceb38a6102ca95bde79205efaa643a0824d3a2 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Oct 2018 15:35:34 +0000 -Subject: [PATCH 09/36] tests: Fix tests when run on AWS. - -When running on AWS two of the tests failed. This was because the -tests did _not_ include a working dmidecode binary, hence the platform -dmidecode binary was being run instead, and that was detecting as AWS -owing to the previous commit. Fix this by supplying a working -dmidecode binary for those tests. ---- - tests/ldoms/sbin/dmidecode | 3 +++ - tests/ppc64-baremetal/sbin/dmidecode | 0 - 2 files changed, 3 insertions(+) - create mode 100755 tests/ldoms/sbin/dmidecode - mode change 100644 => 100755 tests/ppc64-baremetal/sbin/dmidecode - -diff --git a/tests/ldoms/sbin/dmidecode b/tests/ldoms/sbin/dmidecode -new file mode 100755 -index 0000000..3efbee3 ---- /dev/null -+++ b/tests/ldoms/sbin/dmidecode -@@ -0,0 +1,3 @@ -+#!/bin/sh - -+# dmidecode fails on this platform. -+exit 1 -diff --git a/tests/ppc64-baremetal/sbin/dmidecode b/tests/ppc64-baremetal/sbin/dmidecode -old mode 100644 -new mode 100755 --- -2.31.1 - diff --git a/SOURCES/0010-aws-Add-regression-test-for-AWS-on-KVM-on-x86_64-arc.patch b/SOURCES/0010-aws-Add-regression-test-for-AWS-on-KVM-on-x86_64-arc.patch deleted file mode 100644 index dafd927..0000000 --- a/SOURCES/0010-aws-Add-regression-test-for-AWS-on-KVM-on-x86_64-arc.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 129a25f9854930928351c8cc3913a5b9a1c558b4 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Oct 2018 15:23:45 +0000 -Subject: [PATCH 10/36] aws: Add regression test for AWS on KVM on x86_64 - architecture. - ---- - Makefile.am | 6 ++ - tests/aws-kvm-x86/proc/cpuinfo | 52 ++++++++++++++ - tests/aws-kvm-x86/proc/self/status | 46 +++++++++++++ - tests/aws-kvm-x86/sbin/dmidecode | 68 +++++++++++++++++++ - tests/aws-kvm-x86/sbin/uname | 2 + - tests/aws-kvm-x86/sbin/virt-what-cpuid-helper | 2 + - tests/test-aws-kvm-x86.sh | 35 ++++++++++ - 7 files changed, 211 insertions(+) - create mode 100644 tests/aws-kvm-x86/proc/cpuinfo - create mode 100644 tests/aws-kvm-x86/proc/self/status - create mode 100755 tests/aws-kvm-x86/sbin/dmidecode - create mode 100755 tests/aws-kvm-x86/sbin/uname - create mode 100755 tests/aws-kvm-x86/sbin/virt-what-cpuid-helper - create mode 100755 tests/test-aws-kvm-x86.sh - -diff --git a/Makefile.am b/Makefile.am -index 3c0d5ba..1029902 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,6 +39,7 @@ virt-what.txt: virt-what.pod - endif - - TESTS = \ -+ tests/test-aws-kvm-x86.sh \ - tests/test-baremetal.sh \ - tests/test-bhyve.sh \ - tests/test-docker.sh \ -@@ -73,6 +74,11 @@ TESTS = \ - EXTRA_DIST = \ - virt-what.in \ - virt-what.pod \ -+ tests/aws-kvm-x86/proc/cpuinfo \ -+ tests/aws-kvm-x86/proc/self/status \ -+ tests/aws-kvm-x86/sbin/dmidecode \ -+ tests/aws-kvm-x86/sbin/uname \ -+ tests/aws-kvm-x86/sbin/virt-what-cpuid-helper \ - tests/baremetal/proc/cpuinfo \ - tests/baremetal/proc/self/status \ - tests/baremetal/sbin/dmidecode \ -diff --git a/tests/aws-kvm-x86/proc/cpuinfo b/tests/aws-kvm-x86/proc/cpuinfo -new file mode 100644 -index 0000000..449f885 ---- /dev/null -+++ b/tests/aws-kvm-x86/proc/cpuinfo -@@ -0,0 +1,52 @@ -+processor : 0 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 85 -+model name : Intel(R) Xeon(R) Platinum 8124M CPU @ 3.00GHz -+stepping : 3 -+microcode : 0x1000141 -+cpu MHz : 2999.996 -+cache size : 25344 KB -+physical id : 0 -+siblings : 2 -+core id : 0 -+cpu cores : 1 -+apicid : 0 -+initial apicid : 0 -+fpu : yes -+fpu_exception : yes -+cpuid level : 13 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap clflushopt clwb avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 ida arat pku ospke -+bogomips : 5999.99 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 1 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 85 -+model name : Intel(R) Xeon(R) Platinum 8124M CPU @ 3.00GHz -+stepping : 3 -+microcode : 0x1000141 -+cpu MHz : 2999.996 -+cache size : 25344 KB -+physical id : 0 -+siblings : 2 -+core id : 0 -+cpu cores : 1 -+apicid : 1 -+initial apicid : 1 -+fpu : yes -+fpu_exception : yes -+cpuid level : 13 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap clflushopt clwb avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 ida arat pku ospke -+bogomips : 5999.99 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -diff --git a/tests/aws-kvm-x86/proc/self/status b/tests/aws-kvm-x86/proc/self/status -new file mode 100644 -index 0000000..5baf8de ---- /dev/null -+++ b/tests/aws-kvm-x86/proc/self/status -@@ -0,0 +1,46 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 20776 -+Ngid: 0 -+Pid: 20776 -+PPid: 17444 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 256 -+Groups: 0 -+VmPeak: 107972 kB -+VmSize: 107972 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 360 kB -+VmRSS: 360 kB -+RssAnon: 76 kB -+RssFile: 284 kB -+RssShmem: 0 kB -+VmData: 180 kB -+VmStk: 132 kB -+VmExe: 44 kB -+VmLib: 1936 kB -+VmPTE: 36 kB -+VmSwap: 0 kB -+Threads: 1 -+SigQ: 1/14026 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000001fffffffff -+CapEff: 0000001fffffffff -+CapBnd: 0000001fffffffff -+CapAmb: 0000000000000000 -+Seccomp: 0 -+Cpus_allowed: 3 -+Cpus_allowed_list: 0-1 -+Mems_allowed: 00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 1 -+nonvoluntary_ctxt_switches: 1 -diff --git a/tests/aws-kvm-x86/sbin/dmidecode b/tests/aws-kvm-x86/sbin/dmidecode -new file mode 100755 -index 0000000..3b5aa03 ---- /dev/null -+++ b/tests/aws-kvm-x86/sbin/dmidecode -@@ -0,0 +1,68 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.0 -+Getting SMBIOS data from sysfs. -+SMBIOS 2.7 present. -+5 structures occupying 233 bytes. -+Table at 0x000F8FD0. -+ -+Handle 0x0000, DMI type 0, 24 bytes -+BIOS Information -+ Vendor: Amazon EC2 -+ Version: 1.0 -+ Release Date: 10/16/2017 -+ Address: 0xF0000 -+ Runtime Size: 64 kB -+ ROM Size: 64 kB -+ Characteristics: -+ PCI is supported -+ EDD is supported -+ ACPI is supported -+ System is a virtual machine -+ BIOS Revision: 1.0 -+ -+Handle 0x0001, DMI type 1, 27 bytes -+System Information -+ Manufacturer: Amazon EC2 -+ Product Name: c5.large -+ Version: Not Specified -+ Serial Number: ec2cecdd-c1c8-7a71-0ea8-aef580c9f845 -+ UUID: EC2CECDD-C1C8-7A71-0EA8-AEF580C9F845 -+ Wake-up Type: Power Switch -+ SKU Number: Not Specified -+ Family: Not Specified -+ -+Handle 0x0002, DMI type 2, 15 bytes -+Base Board Information -+ Manufacturer: Amazon EC2 -+ Product Name: Not Specified -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: i-04f9b1c56b3c301b5 -+ Features: None -+ Location In Chassis: Not Specified -+ Chassis Handle: 0x0003 -+ Type: Other -+ Contained Object Handles: 0 -+ -+Handle 0x0003, DMI type 3, 21 bytes -+Chassis Information -+ Manufacturer: Amazon EC2 -+ Type: Other -+ Lock: Not Present -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: Amazon EC2 -+ Boot-up State: Safe -+ Power Supply State: Safe -+ Thermal State: Safe -+ Security Status: None -+ OEM Information: 0x00000000 -+ Height: Unspecified -+ Number Of Power Cords: 1 -+ Contained Elements: 0 -+ -+Handle 0x0004, DMI type 127, 4 bytes -+End Of Table -+ -+EOF -diff --git a/tests/aws-kvm-x86/sbin/uname b/tests/aws-kvm-x86/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/aws-kvm-x86/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/aws-kvm-x86/sbin/virt-what-cpuid-helper b/tests/aws-kvm-x86/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..f52a9d7 ---- /dev/null -+++ b/tests/aws-kvm-x86/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo KVMKVMKVM -diff --git a/tests/test-aws-kvm-x86.sh b/tests/test-aws-kvm-x86.sh -new file mode 100755 -index 0000000..db4c19f ---- /dev/null -+++ b/tests/test-aws-kvm-x86.sh -@@ -0,0 +1,35 @@ -+# Test for AWS. -+# Copyright (C) 2018 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+root=tests/aws-kvm-x86 -+ -+output="$(./virt-what --test-root=$root 2>&1)" -+expected="kvm -+aws" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi --- -2.31.1 - diff --git a/SOURCES/0011-aws-Add-regression-test-for-AWS-on-baremetal-on-x86_.patch b/SOURCES/0011-aws-Add-regression-test-for-AWS-on-baremetal-on-x86_.patch deleted file mode 100644 index 83db691..0000000 --- a/SOURCES/0011-aws-Add-regression-test-for-AWS-on-baremetal-on-x86_.patch +++ /dev/null @@ -1,3235 +0,0 @@ -From 298a15ead59c2dbeb9b2fabe7fb502100fdd4dc7 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Oct 2018 15:43:20 +0000 -Subject: [PATCH 11/36] aws: Add regression test for AWS on baremetal on x86_64 - architecture. - ---- - Makefile.am | 6 + - tests/aws-baremetal-x86/proc/cpuinfo | 1872 +++++++++++++++++ - tests/aws-baremetal-x86/proc/self/status | 46 + - tests/aws-baremetal-x86/sbin/dmidecode | 1194 +++++++++++ - tests/aws-baremetal-x86/sbin/uname | 2 + - .../sbin/virt-what-cpuid-helper | 2 + - tests/test-aws-baremetal-x86.sh | 34 + - 7 files changed, 3156 insertions(+) - create mode 100644 tests/aws-baremetal-x86/proc/cpuinfo - create mode 100644 tests/aws-baremetal-x86/proc/self/status - create mode 100755 tests/aws-baremetal-x86/sbin/dmidecode - create mode 100755 tests/aws-baremetal-x86/sbin/uname - create mode 100755 tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper - create mode 100755 tests/test-aws-baremetal-x86.sh - -diff --git a/Makefile.am b/Makefile.am -index 1029902..ad47097 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,6 +39,7 @@ virt-what.txt: virt-what.pod - endif - - TESTS = \ -+ tests/test-aws-baremetal-x86.sh \ - tests/test-aws-kvm-x86.sh \ - tests/test-baremetal.sh \ - tests/test-bhyve.sh \ -@@ -74,6 +75,11 @@ TESTS = \ - EXTRA_DIST = \ - virt-what.in \ - virt-what.pod \ -+ tests/aws-baremetal-x86/proc/cpuinfo \ -+ tests/aws-baremetal-x86/proc/self/status \ -+ tests/aws-baremetal-x86/sbin/dmidecode \ -+ tests/aws-baremetal-x86/sbin/uname \ -+ tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper \ - tests/aws-kvm-x86/proc/cpuinfo \ - tests/aws-kvm-x86/proc/self/status \ - tests/aws-kvm-x86/sbin/dmidecode \ -diff --git a/tests/aws-baremetal-x86/proc/cpuinfo b/tests/aws-baremetal-x86/proc/cpuinfo -new file mode 100644 -index 0000000..91bd54e ---- /dev/null -+++ b/tests/aws-baremetal-x86/proc/cpuinfo -@@ -0,0 +1,1872 @@ -+processor : 0 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1999.163 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 0 -+cpu cores : 18 -+apicid : 0 -+initial apicid : 0 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 1 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2169.726 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 1 -+cpu cores : 18 -+apicid : 2 -+initial apicid : 2 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 2 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1705.346 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 2 -+cpu cores : 18 -+apicid : 4 -+initial apicid : 4 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 3 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2450.769 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 3 -+cpu cores : 18 -+apicid : 6 -+initial apicid : 6 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 4 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1781.994 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 4 -+cpu cores : 18 -+apicid : 8 -+initial apicid : 8 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 5 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1418.127 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 8 -+cpu cores : 18 -+apicid : 16 -+initial apicid : 16 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 6 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1375.451 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 9 -+cpu cores : 18 -+apicid : 18 -+initial apicid : 18 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 7 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2031.170 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 10 -+cpu cores : 18 -+apicid : 20 -+initial apicid : 20 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 8 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1796.453 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 11 -+cpu cores : 18 -+apicid : 22 -+initial apicid : 22 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 9 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1320.843 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 16 -+cpu cores : 18 -+apicid : 32 -+initial apicid : 32 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 10 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1607.080 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 17 -+cpu cores : 18 -+apicid : 34 -+initial apicid : 34 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 11 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1302.313 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 18 -+cpu cores : 18 -+apicid : 36 -+initial apicid : 36 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 12 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1516.394 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 19 -+cpu cores : 18 -+apicid : 38 -+initial apicid : 38 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 13 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1267.358 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 20 -+cpu cores : 18 -+apicid : 40 -+initial apicid : 40 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 14 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1528.887 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 24 -+cpu cores : 18 -+apicid : 48 -+initial apicid : 48 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 15 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1402.264 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 25 -+cpu cores : 18 -+apicid : 50 -+initial apicid : 50 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 16 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1201.519 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 26 -+cpu cores : 18 -+apicid : 52 -+initial apicid : 52 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 17 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1666.320 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 27 -+cpu cores : 18 -+apicid : 54 -+initial apicid : 54 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 18 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1674.041 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 0 -+cpu cores : 18 -+apicid : 64 -+initial apicid : 64 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 19 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2210.437 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 1 -+cpu cores : 18 -+apicid : 66 -+initial apicid : 66 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 20 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1354.254 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 2 -+cpu cores : 18 -+apicid : 68 -+initial apicid : 68 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 21 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1326.318 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 3 -+cpu cores : 18 -+apicid : 70 -+initial apicid : 70 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 22 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2132.806 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 4 -+cpu cores : 18 -+apicid : 72 -+initial apicid : 72 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 23 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1844.604 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 8 -+cpu cores : 18 -+apicid : 80 -+initial apicid : 80 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 24 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1322.387 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 9 -+cpu cores : 18 -+apicid : 82 -+initial apicid : 82 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 25 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1324.072 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 10 -+cpu cores : 18 -+apicid : 84 -+initial apicid : 84 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 26 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1200.677 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 11 -+cpu cores : 18 -+apicid : 86 -+initial apicid : 86 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 27 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1607.501 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 16 -+cpu cores : 18 -+apicid : 96 -+initial apicid : 96 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 28 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1200.677 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 17 -+cpu cores : 18 -+apicid : 98 -+initial apicid : 98 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 29 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1324.633 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 18 -+cpu cores : 18 -+apicid : 100 -+initial apicid : 100 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 30 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1322.106 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 19 -+cpu cores : 18 -+apicid : 102 -+initial apicid : 102 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 31 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1201.098 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 20 -+cpu cores : 18 -+apicid : 104 -+initial apicid : 104 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 32 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1450.695 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 24 -+cpu cores : 18 -+apicid : 112 -+initial apicid : 112 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 33 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1314.807 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 25 -+cpu cores : 18 -+apicid : 114 -+initial apicid : 114 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 34 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1318.316 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 26 -+cpu cores : 18 -+apicid : 116 -+initial apicid : 116 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 35 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1850.079 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 27 -+cpu cores : 18 -+apicid : 118 -+initial apicid : 118 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 36 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1567.071 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 0 -+cpu cores : 18 -+apicid : 1 -+initial apicid : 1 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 37 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2778.558 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 1 -+cpu cores : 18 -+apicid : 3 -+initial apicid : 3 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 38 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1557.666 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 2 -+cpu cores : 18 -+apicid : 5 -+initial apicid : 5 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 39 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2291.436 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 3 -+cpu cores : 18 -+apicid : 7 -+initial apicid : 7 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 40 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1277.886 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 4 -+cpu cores : 18 -+apicid : 9 -+initial apicid : 9 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 41 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2046.191 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 8 -+cpu cores : 18 -+apicid : 17 -+initial apicid : 17 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 42 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1554.858 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 9 -+cpu cores : 18 -+apicid : 19 -+initial apicid : 19 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 43 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1440.869 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 10 -+cpu cores : 18 -+apicid : 21 -+initial apicid : 21 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 44 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1215.557 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 11 -+cpu cores : 18 -+apicid : 23 -+initial apicid : 23 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 45 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 2059.948 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 16 -+cpu cores : 18 -+apicid : 33 -+initial apicid : 33 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 46 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1597.674 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 17 -+cpu cores : 18 -+apicid : 35 -+initial apicid : 35 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 47 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1554.296 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 18 -+cpu cores : 18 -+apicid : 37 -+initial apicid : 37 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 48 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1803.753 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 19 -+cpu cores : 18 -+apicid : 39 -+initial apicid : 39 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 49 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1665.899 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 20 -+cpu cores : 18 -+apicid : 41 -+initial apicid : 41 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 50 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1685.131 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 24 -+cpu cores : 18 -+apicid : 49 -+initial apicid : 49 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 51 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1553.454 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 25 -+cpu cores : 18 -+apicid : 51 -+initial apicid : 51 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 52 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1317.333 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 26 -+cpu cores : 18 -+apicid : 53 -+initial apicid : 53 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 53 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1298.101 -+cache size : 46080 KB -+physical id : 0 -+siblings : 36 -+core id : 27 -+cpu cores : 18 -+apicid : 55 -+initial apicid : 55 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4599.94 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 54 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1390.191 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 0 -+cpu cores : 18 -+apicid : 65 -+initial apicid : 65 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 55 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1751.391 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 1 -+cpu cores : 18 -+apicid : 67 -+initial apicid : 67 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 56 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1321.685 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 2 -+cpu cores : 18 -+apicid : 69 -+initial apicid : 69 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 57 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1322.387 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 3 -+cpu cores : 18 -+apicid : 71 -+initial apicid : 71 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 58 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1247.283 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 4 -+cpu cores : 18 -+apicid : 73 -+initial apicid : 73 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 59 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1457.012 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 8 -+cpu cores : 18 -+apicid : 81 -+initial apicid : 81 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 60 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1623.785 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 9 -+cpu cores : 18 -+apicid : 83 -+initial apicid : 83 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 61 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1369.696 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 10 -+cpu cores : 18 -+apicid : 85 -+initial apicid : 85 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 62 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1643.438 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 11 -+cpu cores : 18 -+apicid : 87 -+initial apicid : 87 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 63 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1756.164 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 16 -+cpu cores : 18 -+apicid : 97 -+initial apicid : 97 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 64 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1517.517 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 17 -+cpu cores : 18 -+apicid : 99 -+initial apicid : 99 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 65 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1200.115 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 18 -+cpu cores : 18 -+apicid : 101 -+initial apicid : 101 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 66 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1778.765 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 19 -+cpu cores : 18 -+apicid : 103 -+initial apicid : 103 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 67 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1200.537 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 20 -+cpu cores : 18 -+apicid : 105 -+initial apicid : 105 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 68 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1395.947 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 24 -+cpu cores : 18 -+apicid : 113 -+initial apicid : 113 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 69 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1200.537 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 25 -+cpu cores : 18 -+apicid : 115 -+initial apicid : 115 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 70 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1200.396 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 26 -+cpu cores : 18 -+apicid : 117 -+initial apicid : 117 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 71 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 79 -+model name : Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+stepping : 1 -+microcode : 0xb000022 -+cpu MHz : 1205.731 -+cache size : 46080 KB -+physical id : 1 -+siblings : 36 -+core id : 27 -+cpu cores : 18 -+apicid : 119 -+initial apicid : 119 -+fpu : yes -+fpu_exception : yes -+cpuid level : 20 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb cat_l3 cdp_l3 intel_ppin intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts -+bogomips : 4606.96 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -diff --git a/tests/aws-baremetal-x86/proc/self/status b/tests/aws-baremetal-x86/proc/self/status -new file mode 100644 -index 0000000..3530e5d ---- /dev/null -+++ b/tests/aws-baremetal-x86/proc/self/status -@@ -0,0 +1,46 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 25127 -+Ngid: 0 -+Pid: 25127 -+PPid: 18233 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 256 -+Groups: 0 -+VmPeak: 107972 kB -+VmSize: 107972 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 360 kB -+VmRSS: 360 kB -+RssAnon: 76 kB -+RssFile: 284 kB -+RssShmem: 0 kB -+VmData: 180 kB -+VmStk: 132 kB -+VmExe: 44 kB -+VmLib: 1936 kB -+VmPTE: 40 kB -+VmSwap: 0 kB -+Threads: 1 -+SigQ: 1/2062566 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000001fffffffff -+CapEff: 0000001fffffffff -+CapBnd: 0000001fffffffff -+CapAmb: 0000000000000000 -+Seccomp: 0 -+Cpus_allowed: ff,ffffffff,ffffffff -+Cpus_allowed_list: 0-71 -+Mems_allowed: 00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003 -+Mems_allowed_list: 0-1 -+voluntary_ctxt_switches: 0 -+nonvoluntary_ctxt_switches: 1 -diff --git a/tests/aws-baremetal-x86/sbin/dmidecode b/tests/aws-baremetal-x86/sbin/dmidecode -new file mode 100755 -index 0000000..d1fa551 ---- /dev/null -+++ b/tests/aws-baremetal-x86/sbin/dmidecode -@@ -0,0 +1,1194 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.0 -+Getting SMBIOS data from sysfs. -+SMBIOS 3.0 present. -+90 structures occupying 4575 bytes. -+Table at 0x000EB000. -+ -+Handle 0x0000, DMI type 0, 24 bytes -+BIOS Information -+ Vendor: Amazon EC2 -+ Version: 1.0 -+ Release Date: 10/16/2017 -+ Address: 0xF0000 -+ Runtime Size: 64 kB -+ ROM Size: 8192 kB -+ Characteristics: -+ PCI is supported -+ BIOS is upgradeable -+ BIOS shadowing is allowed -+ Boot from CD is supported -+ Selectable boot is supported -+ BIOS ROM is socketed -+ EDD is supported -+ 5.25"/1.2 MB floppy services are supported (int 13h) -+ 3.5"/720 kB floppy services are supported (int 13h) -+ 3.5"/2.88 MB floppy services are supported (int 13h) -+ Print screen service is supported (int 5h) -+ 8042 keyboard services are supported (int 9h) -+ Serial services are supported (int 14h) -+ Printer services are supported (int 17h) -+ ACPI is supported -+ USB legacy is supported -+ BIOS boot specification is supported -+ Targeted content distribution is supported -+ UEFI is supported -+ BIOS Revision: 5.11 -+ -+Handle 0x0001, DMI type 1, 27 bytes -+System Information -+ Manufacturer: Amazon EC2 -+ Product Name: i3.metal -+ Version: 00001 -+ Serial Number: ec2240c6-8e37-edcf-72ac-7951361680f2 -+ UUID: EC2240C6-8E37-EDCF-72AC-7951361680F2 -+ Wake-up Type: Power Switch -+ SKU Number: -+ Family: 110-000523-002 -+ -+Handle 0x0002, DMI type 2, 15 bytes -+Base Board Information -+ Manufacturer: Amazon EC2 -+ Product Name: Not Specified -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: i-035891f969d0ff36b -+ Features: -+ Board is a hosting board -+ Board is replaceable -+ Location In Chassis: empty -+ Chassis Handle: 0x0003 -+ Type: Motherboard -+ Contained Object Handles: 0 -+ -+Handle 0x0003, DMI type 3, 25 bytes -+Chassis Information -+ Manufacturer: Amazon EC2 -+ Type: Rack Mount Chassis -+ Lock: Not Present -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: Amazon EC2 -+ Boot-up State: Safe -+ Power Supply State: Safe -+ Thermal State: Safe -+ Security Status: None -+ OEM Information: 0x00000000 -+ Height: Unspecified -+ Number Of Power Cords: 1 -+ Contained Elements: 1 -+ (0) -+ SKU Number: To be filled by O.E.M -+ -+Handle 0x0004, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J17 -+ Internal Connector Type: None -+ External Reference Designator: MEZZ_0 -+ External Connector Type: RJ-45 -+ Port Type: Network Port -+ -+Handle 0x0005, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J99 -+ Internal Connector Type: None -+ External Reference Designator: MEZZ_1 -+ External Connector Type: RJ-45 -+ Port Type: Network Port -+ -+Handle 0x0006, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J43 -+ Internal Connector Type: None -+ External Reference Designator: External USB0 Port 0 -+ External Connector Type: Access Bus (USB) -+ Port Type: USB -+ -+Handle 0x0007, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J43 -+ Internal Connector Type: None -+ External Reference Designator: External USB0 Port 1 -+ External Connector Type: Access Bus (USB) -+ Port Type: USB -+ -+Handle 0x0008, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: VGA1 -+ Internal Connector Type: None -+ External Reference Designator: VGA -+ External Connector Type: DB-15 female -+ Port Type: Video Port -+ -+Handle 0x0009, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J124 -+ Internal Connector Type: None -+ External Reference Designator: COM Port -+ External Connector Type: DB-9 male -+ Port Type: Serial Port 16550A Compatible -+ -+Handle 0x000A, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J158 -+ Internal Connector Type: None -+ External Reference Designator: Mgt_LAN -+ External Connector Type: RJ-45 -+ Port Type: Network Port -+ -+Handle 0x000B, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J98 - PCIE RISER_0 -+ Internal Connector Type: Other -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: Other -+ -+Handle 0x000C, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J102 - PCIE RISER_1 -+ Internal Connector Type: Other -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: Other -+ -+Handle 0x000D, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J110 - SATA_0 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SATA -+ -+Handle 0x000E, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J111 - SATA_1 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SATA -+ -+Handle 0x000F, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J100 - PCIeSSD_0 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0010, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J101 - PCIeSSD_1 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0011, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J104 - PCIeSSD_2 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0012, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J105 - PCIeSSD_3 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0013, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J107 - PCIeSSD_4 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0014, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J106 - PCIeSSD_5 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0015, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J108 - PCIeSSD_6 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0016, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J109 - PCIeSSD_7 -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SAS -+ -+Handle 0x0017, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J96 - TPM -+ Internal Connector Type: Other -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: Other -+ -+Handle 0x0018, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J135 - Internal USB1 -+ Internal Connector Type: Access Bus (USB) -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: USB -+ -+Handle 0x0019, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J136 - Internal USB2 -+ Internal Connector Type: Access Bus (USB) -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: USB -+ -+Handle 0x001A, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J40 - SATA CONN(0-3) -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SATA -+ -+Handle 0x001B, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J41 - SATA CONN(4-7) -+ Internal Connector Type: SAS/SATA Plug Receptacle -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: SATA -+ -+Handle 0x001C, DMI type 8, 9 bytes -+Port Connector Information -+ Internal Reference Designator: J56 - Front USB Port 0 & Port1 -+ Internal Connector Type: Access Bus (USB) -+ External Reference Designator: Not Specified -+ External Connector Type: None -+ Port Type: USB -+ -+Handle 0x001D, DMI type 9, 17 bytes -+System Slot Information -+ Designation: RISER0_SLOT0 -+ Type: x16 PCI Express 3 x16 -+ Current Usage: In Use -+ Length: Long -+ ID: 1 -+ Characteristics: -+ 3.3 V is provided -+ Opening is shared -+ PME signal is supported -+ Bus Address: 0000:02:03.0 -+ -+Handle 0x001E, DMI type 9, 17 bytes -+System Slot Information -+ Designation: RISER1_SLOT0 -+ Type: x16 PCI Express 3 x16 -+ Current Usage: Available -+ Length: Long -+ ID: 2 -+ Characteristics: -+ 3.3 V is provided -+ Opening is shared -+ PME signal is supported -+ Bus Address: 0000:ff:01.0 -+ -+Handle 0x001F, DMI type 10, 6 bytes -+On Board Device Information -+ Type: Video -+ Status: Enabled -+ Description: AST2400 -+ -+Handle 0x0020, DMI type 11, 5 bytes -+OEM Strings -+ String 1: empty -+ String 2: empty -+ String 3: empty -+ String 4: empty -+ String 5: empty -+ -+Handle 0x0021, DMI type 12, 5 bytes -+System Configuration Options -+ Option 1: Default string -+ -+Handle 0x0022, DMI type 32, 20 bytes -+System Boot Information -+ Status: No errors detected -+ -+Handle 0x0023, DMI type 41, 11 bytes -+Onboard Device -+ Reference Designation: Onboard IGD -+ Type: Video -+ Status: Enabled -+ Type Instance: 1 -+ Bus Address: 0000:00:02.0 -+ -+Handle 0x0024, DMI type 41, 11 bytes -+Onboard Device -+ Reference Designation: Onboard LAN -+ Type: Ethernet -+ Status: Enabled -+ Type Instance: 1 -+ Bus Address: 0000:00:19.0 -+ -+Handle 0x0025, DMI type 41, 11 bytes -+Onboard Device -+ Reference Designation: Onboard 1394 -+ Type: Other -+ Status: Enabled -+ Type Instance: 1 -+ Bus Address: 0000:03:1c.2 -+ -+Handle 0x0026, DMI type 38, 18 bytes -+IPMI Device Information -+ Interface Type: KCS (Keyboard Control Style) -+ Specification Version: 2.0 -+ I2C Slave Address: 0x10 -+ NV Storage Device: Not Present -+ Base Address: 0x0000000000000CA2 (I/O) -+ Register Spacing: Successive Byte Boundaries -+ -+Handle 0x0027, DMI type 42, 12 bytes -+Management Controller Host Interface -+ Interface Type: OEM -+ Vendor ID: 0xFF0102FF -+ -+Handle 0x0036, DMI type 16, 23 bytes -+Physical Memory Array -+ Location: System Board Or Motherboard -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 64 GB -+ Error Information Handle: Not Provided -+ Number Of Devices: 4 -+ -+Handle 0x0037, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x00000000000 -+ Ending Address: 0x01FFFFFFFFF -+ Range Size: 128 GB -+ Physical Array Handle: 0x0036 -+ Partition Width: 4 -+ -+Handle 0x0038, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0036 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_A0 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A1260F -+ Asset Tag: DIMM_A0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0039, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x00000000000 -+ Ending Address: 0x007FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0038 -+ Memory Array Mapped Address Handle: 0x0037 -+ Partition Row Position: 1 -+ -+Handle 0x003A, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0036 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_A1 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A1277A -+ Asset Tag: DIMM_A1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x003B, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x00800000000 -+ Ending Address: 0x00FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x003A -+ Memory Array Mapped Address Handle: 0x0037 -+ Partition Row Position: 1 -+ -+Handle 0x003C, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0036 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_B0 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A126A0 -+ Asset Tag: DIMM_B0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x003D, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x01000000000 -+ Ending Address: 0x017FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x003C -+ Memory Array Mapped Address Handle: 0x0037 -+ Partition Row Position: 1 -+ -+Handle 0x003E, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0036 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_B1 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A126A6 -+ Asset Tag: DIMM_B1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x003F, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x01800000000 -+ Ending Address: 0x01FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x003E -+ Memory Array Mapped Address Handle: 0x0037 -+ Partition Row Position: 1 -+ -+Handle 0x0040, DMI type 16, 23 bytes -+Physical Memory Array -+ Location: System Board Or Motherboard -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 64 GB -+ Error Information Handle: Not Provided -+ Number Of Devices: 4 -+ -+Handle 0x0041, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x02000000000 -+ Ending Address: 0x03FFFFFFFFF -+ Range Size: 128 GB -+ Physical Array Handle: 0x0040 -+ Partition Width: 4 -+ -+Handle 0x0042, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0040 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_C0 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A12674 -+ Asset Tag: DIMM_C0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0043, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x02000000000 -+ Ending Address: 0x027FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0042 -+ Memory Array Mapped Address Handle: 0x0041 -+ Partition Row Position: 1 -+ -+Handle 0x0044, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0040 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_C1 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A127EB -+ Asset Tag: DIMM_C1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0045, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x02800000000 -+ Ending Address: 0x02FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0044 -+ Memory Array Mapped Address Handle: 0x0041 -+ Partition Row Position: 1 -+ -+Handle 0x0046, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0040 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_D0 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A12744 -+ Asset Tag: DIMM_D0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0047, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x03000000000 -+ Ending Address: 0x037FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0046 -+ Memory Array Mapped Address Handle: 0x0041 -+ Partition Row Position: 1 -+ -+Handle 0x0048, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0040 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_D1 -+ Bank Locator: CPU 0 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A127C7 -+ Asset Tag: DIMM_D1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0049, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x03800000000 -+ Ending Address: 0x03FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0048 -+ Memory Array Mapped Address Handle: 0x0041 -+ Partition Row Position: 1 -+ -+Handle 0x004A, DMI type 16, 23 bytes -+Physical Memory Array -+ Location: System Board Or Motherboard -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 64 GB -+ Error Information Handle: Not Provided -+ Number Of Devices: 4 -+ -+Handle 0x004B, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x04000000000 -+ Ending Address: 0x05FFFFFFFFF -+ Range Size: 128 GB -+ Physical Array Handle: 0x004A -+ Partition Width: 4 -+ -+Handle 0x004C, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x004A -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_E0 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A127D1 -+ Asset Tag: DIMM_E0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x004D, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x04000000000 -+ Ending Address: 0x047FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x004C -+ Memory Array Mapped Address Handle: 0x004B -+ Partition Row Position: 1 -+ -+Handle 0x004E, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x004A -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_E1 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A127D9 -+ Asset Tag: DIMM_E1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x004F, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x04800000000 -+ Ending Address: 0x04FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x004E -+ Memory Array Mapped Address Handle: 0x004B -+ Partition Row Position: 1 -+ -+Handle 0x0050, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x004A -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_F0 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A1276E -+ Asset Tag: DIMM_F0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0051, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x05000000000 -+ Ending Address: 0x057FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0050 -+ Memory Array Mapped Address Handle: 0x004B -+ Partition Row Position: 1 -+ -+Handle 0x0052, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x004A -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_F1 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A127E9 -+ Asset Tag: DIMM_F1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0053, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x05800000000 -+ Ending Address: 0x05FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0052 -+ Memory Array Mapped Address Handle: 0x004B -+ Partition Row Position: 1 -+ -+Handle 0x0054, DMI type 16, 23 bytes -+Physical Memory Array -+ Location: System Board Or Motherboard -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 64 GB -+ Error Information Handle: Not Provided -+ Number Of Devices: 4 -+ -+Handle 0x0055, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x06000000000 -+ Ending Address: 0x07FFFFFFFFF -+ Range Size: 128 GB -+ Physical Array Handle: 0x0054 -+ Partition Width: 4 -+ -+Handle 0x0056, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0054 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_G0 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A126E9 -+ Asset Tag: DIMM_G0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0057, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x06000000000 -+ Ending Address: 0x067FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0056 -+ Memory Array Mapped Address Handle: 0x0055 -+ Partition Row Position: 1 -+ -+Handle 0x0058, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0054 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_G1 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A12633 -+ Asset Tag: DIMM_G1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x0059, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x06800000000 -+ Ending Address: 0x06FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x0058 -+ Memory Array Mapped Address Handle: 0x0055 -+ Partition Row Position: 1 -+ -+Handle 0x005A, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0054 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_H0 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A1264A -+ Asset Tag: DIMM_H0_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x005B, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x07000000000 -+ Ending Address: 0x077FFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x005A -+ Memory Array Mapped Address Handle: 0x0055 -+ Partition Row Position: 1 -+ -+Handle 0x005C, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x0054 -+ Error Information Handle: Not Provided -+ Total Width: 72 bits -+ Data Width: 72 bits -+ Size: 32 GB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM_H1 -+ Bank Locator: CPU 1 -+ Type: DDR4 -+ Type Detail: Synchronous -+ Speed: 2400 MHz -+ Manufacturer: Hynix Semiconductor -+ Serial Number: 11A12731 -+ Asset Tag: DIMM_H1_AssetTag -+ Part Number: HMA84GR7AFR4N-UH -+ Rank: 2 -+ Configured Clock Speed: 2133 MHz -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x005D, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x07800000000 -+ Ending Address: 0x07FFFFFFFFF -+ Range Size: 32 GB -+ Physical Device Handle: 0x005C -+ Memory Array Mapped Address Handle: 0x0055 -+ Partition Row Position: 1 -+ -+Handle 0x005E, DMI type 7, 19 bytes -+Cache Information -+ Socket Designation: CPU Internal L1 -+ Configuration: Enabled, Not Socketed, Level 1 -+ Operational Mode: Write Back -+ Location: Internal -+ Installed Size: 1152 kB -+ Maximum Size: 1152 kB -+ Supported SRAM Types: -+ Unknown -+ Installed SRAM Type: Unknown -+ Speed: Unknown -+ Error Correction Type: Parity -+ System Type: Other -+ Associativity: 8-way Set-associative -+ -+Handle 0x005F, DMI type 7, 19 bytes -+Cache Information -+ Socket Designation: CPU Internal L2 -+ Configuration: Enabled, Not Socketed, Level 2 -+ Operational Mode: Write Back -+ Location: Internal -+ Installed Size: 4608 kB -+ Maximum Size: 4608 kB -+ Supported SRAM Types: -+ Unknown -+ Installed SRAM Type: Unknown -+ Speed: Unknown -+ Error Correction Type: Single-bit ECC -+ System Type: Unified -+ Associativity: 8-way Set-associative -+ -+Handle 0x0060, DMI type 7, 19 bytes -+Cache Information -+ Socket Designation: CPU Internal L3 -+ Configuration: Enabled, Not Socketed, Level 3 -+ Operational Mode: Write Back -+ Location: Internal -+ Installed Size: 46080 kB -+ Maximum Size: 46080 kB -+ Supported SRAM Types: -+ Unknown -+ Installed SRAM Type: Unknown -+ Speed: Unknown -+ Error Correction Type: Single-bit ECC -+ System Type: Unified -+ Associativity: 20-way Set-associative -+ -+Handle 0x0061, DMI type 4, 48 bytes -+Processor Information -+ Socket Designation: SOCKET 0 -+ Type: Central Processor -+ Family: Xeon -+ Manufacturer: Intel -+ ID: F1 06 04 00 FF FB EB BF -+ Signature: Type 0, Family 6, Model 79, Stepping 1 -+ Flags: -+ FPU (Floating-point unit on-chip) -+ VME (Virtual mode extension) -+ DE (Debugging extension) -+ PSE (Page size extension) -+ TSC (Time stamp counter) -+ MSR (Model specific registers) -+ PAE (Physical address extension) -+ MCE (Machine check exception) -+ CX8 (CMPXCHG8 instruction supported) -+ APIC (On-chip APIC hardware supported) -+ SEP (Fast system call) -+ MTRR (Memory type range registers) -+ PGE (Page global enable) -+ MCA (Machine check architecture) -+ CMOV (Conditional move instruction supported) -+ PAT (Page attribute table) -+ PSE-36 (36-bit page size extension) -+ CLFSH (CLFLUSH instruction supported) -+ DS (Debug store) -+ ACPI (ACPI supported) -+ MMX (MMX technology supported) -+ FXSR (FXSAVE and FXSTOR instructions supported) -+ SSE (Streaming SIMD extensions) -+ SSE2 (Streaming SIMD extensions 2) -+ SS (Self-snoop) -+ HTT (Multi-threading) -+ TM (Thermal monitor supported) -+ PBE (Pending break enabled) -+ Version: Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+ Voltage: 1.6 V -+ External Clock: 100 MHz -+ Max Speed: 3000 MHz -+ Current Speed: 2300 MHz -+ Status: Populated, Enabled -+ Upgrade: Socket LGA2011-3 -+ L1 Cache Handle: 0x005E -+ L2 Cache Handle: 0x005F -+ L3 Cache Handle: 0x0060 -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Core Count: 18 -+ Core Enabled: 18 -+ Thread Count: 36 -+ Characteristics: -+ 64-bit capable -+ Multi-Core -+ Hardware Thread -+ Execute Protection -+ Enhanced Virtualization -+ Power/Performance Control -+ -+Handle 0x0062, DMI type 7, 19 bytes -+Cache Information -+ Socket Designation: CPU Internal L1 -+ Configuration: Enabled, Not Socketed, Level 1 -+ Operational Mode: Write Back -+ Location: Internal -+ Installed Size: 1152 kB -+ Maximum Size: 1152 kB -+ Supported SRAM Types: -+ Unknown -+ Installed SRAM Type: Unknown -+ Speed: Unknown -+ Error Correction Type: Parity -+ System Type: Other -+ Associativity: 8-way Set-associative -+ -+Handle 0x0063, DMI type 7, 19 bytes -+Cache Information -+ Socket Designation: CPU Internal L2 -+ Configuration: Enabled, Not Socketed, Level 2 -+ Operational Mode: Write Back -+ Location: Internal -+ Installed Size: 4608 kB -+ Maximum Size: 4608 kB -+ Supported SRAM Types: -+ Unknown -+ Installed SRAM Type: Unknown -+ Speed: Unknown -+ Error Correction Type: Single-bit ECC -+ System Type: Unified -+ Associativity: 8-way Set-associative -+ -+Handle 0x0064, DMI type 7, 19 bytes -+Cache Information -+ Socket Designation: CPU Internal L3 -+ Configuration: Enabled, Not Socketed, Level 3 -+ Operational Mode: Write Back -+ Location: Internal -+ Installed Size: 46080 kB -+ Maximum Size: 46080 kB -+ Supported SRAM Types: -+ Unknown -+ Installed SRAM Type: Unknown -+ Speed: Unknown -+ Error Correction Type: Single-bit ECC -+ System Type: Unified -+ Associativity: 20-way Set-associative -+ -+Handle 0x0065, DMI type 4, 48 bytes -+Processor Information -+ Socket Designation: SOCKET 1 -+ Type: Central Processor -+ Family: Xeon -+ Manufacturer: Intel -+ ID: F1 06 04 00 FF FB EB BF -+ Signature: Type 0, Family 6, Model 79, Stepping 1 -+ Flags: -+ FPU (Floating-point unit on-chip) -+ VME (Virtual mode extension) -+ DE (Debugging extension) -+ PSE (Page size extension) -+ TSC (Time stamp counter) -+ MSR (Model specific registers) -+ PAE (Physical address extension) -+ MCE (Machine check exception) -+ CX8 (CMPXCHG8 instruction supported) -+ APIC (On-chip APIC hardware supported) -+ SEP (Fast system call) -+ MTRR (Memory type range registers) -+ PGE (Page global enable) -+ MCA (Machine check architecture) -+ CMOV (Conditional move instruction supported) -+ PAT (Page attribute table) -+ PSE-36 (36-bit page size extension) -+ CLFSH (CLFLUSH instruction supported) -+ DS (Debug store) -+ ACPI (ACPI supported) -+ MMX (MMX technology supported) -+ FXSR (FXSAVE and FXSTOR instructions supported) -+ SSE (Streaming SIMD extensions) -+ SSE2 (Streaming SIMD extensions 2) -+ SS (Self-snoop) -+ HTT (Multi-threading) -+ TM (Thermal monitor supported) -+ PBE (Pending break enabled) -+ Version: Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz -+ Voltage: 1.6 V -+ External Clock: 100 MHz -+ Max Speed: 3000 MHz -+ Current Speed: 2300 MHz -+ Status: Populated, Enabled -+ Upgrade: Socket LGA2011-3 -+ L1 Cache Handle: 0x0062 -+ L2 Cache Handle: 0x0063 -+ L3 Cache Handle: 0x0064 -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Core Count: 18 -+ Core Enabled: 18 -+ Thread Count: 36 -+ Characteristics: -+ 64-bit capable -+ Multi-Core -+ Hardware Thread -+ Execute Protection -+ Enhanced Virtualization -+ Power/Performance Control -+ -+Handle 0x0066, DMI type 13, 22 bytes -+BIOS Language Information -+ Language Description Format: Long -+ Installable Languages: 1 -+ en|US|iso8859-1 -+ Currently Installed Language: en|US|iso8859-1 -+ -+Handle 0x0076, DMI type 127, 4 bytes -+End Of Table -+ -+EOF -diff --git a/tests/aws-baremetal-x86/sbin/uname b/tests/aws-baremetal-x86/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/aws-baremetal-x86/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper b/tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..b446009 ---- /dev/null -+++ b/tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo -diff --git a/tests/test-aws-baremetal-x86.sh b/tests/test-aws-baremetal-x86.sh -new file mode 100755 -index 0000000..d456163 ---- /dev/null -+++ b/tests/test-aws-baremetal-x86.sh -@@ -0,0 +1,34 @@ -+# Test for AWS. -+# Copyright (C) 2018 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+root=tests/aws-baremetal-x86 -+ -+output="$(./virt-what --test-root=$root 2>&1)" -+expected="aws" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi --- -2.31.1 - diff --git a/SOURCES/0012-aws-Add-regression-test-for-AWS-on-Xen-on-x86_64-arc.patch b/SOURCES/0012-aws-Add-regression-test-for-AWS-on-Xen-on-x86_64-arc.patch deleted file mode 100644 index f3fc170..0000000 --- a/SOURCES/0012-aws-Add-regression-test-for-AWS-on-Xen-on-x86_64-arc.patch +++ /dev/null @@ -1,358 +0,0 @@ -From 350291e1ca417eab9d2aa2408589f0259cac007c Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Oct 2018 15:23:45 +0000 -Subject: [PATCH 12/36] aws: Add regression test for AWS on Xen on x86_64 - architecture. - ---- - Makefile.am | 6 + - tests/aws-xen-x86/proc/cpuinfo | 52 +++++++ - tests/aws-xen-x86/proc/self/status | 46 ++++++ - tests/aws-xen-x86/sbin/dmidecode | 135 ++++++++++++++++++ - tests/aws-xen-x86/sbin/uname | 2 + - tests/aws-xen-x86/sbin/virt-what-cpuid-helper | 2 + - tests/test-aws-xen-x86.sh | 36 +++++ - 7 files changed, 279 insertions(+) - create mode 100644 tests/aws-xen-x86/proc/cpuinfo - create mode 100644 tests/aws-xen-x86/proc/self/status - create mode 100755 tests/aws-xen-x86/sbin/dmidecode - create mode 100755 tests/aws-xen-x86/sbin/uname - create mode 100755 tests/aws-xen-x86/sbin/virt-what-cpuid-helper - create mode 100755 tests/test-aws-xen-x86.sh - -diff --git a/Makefile.am b/Makefile.am -index ad47097..22680a0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -41,6 +41,7 @@ endif - TESTS = \ - tests/test-aws-baremetal-x86.sh \ - tests/test-aws-kvm-x86.sh \ -+ tests/test-aws-xen-x86.sh \ - tests/test-baremetal.sh \ - tests/test-bhyve.sh \ - tests/test-docker.sh \ -@@ -85,6 +86,11 @@ EXTRA_DIST = \ - tests/aws-kvm-x86/sbin/dmidecode \ - tests/aws-kvm-x86/sbin/uname \ - tests/aws-kvm-x86/sbin/virt-what-cpuid-helper \ -+ tests/aws-xen-x86/proc/cpuinfo \ -+ tests/aws-xen-x86/proc/self/status \ -+ tests/aws-xen-x86/sbin/dmidecode \ -+ tests/aws-xen-x86/sbin/uname \ -+ tests/aws-xen-x86/sbin/virt-what-cpuid-helper \ - tests/baremetal/proc/cpuinfo \ - tests/baremetal/proc/self/status \ - tests/baremetal/sbin/dmidecode \ -diff --git a/tests/aws-xen-x86/proc/cpuinfo b/tests/aws-xen-x86/proc/cpuinfo -new file mode 100644 -index 0000000..ff0b16b ---- /dev/null -+++ b/tests/aws-xen-x86/proc/cpuinfo -@@ -0,0 +1,52 @@ -+processor : 0 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 63 -+model name : Intel(R) Xeon(R) CPU E5-2666 v3 @ 2.90GHz -+stepping : 2 -+microcode : 0x3c -+cpu MHz : 2900.281 -+cache size : 25600 KB -+physical id : 0 -+siblings : 2 -+core id : 0 -+cpu cores : 1 -+apicid : 0 -+initial apicid : 0 -+fpu : yes -+fpu_exception : yes -+cpuid level : 13 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology eagerfpu pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm fsgsbase bmi1 avx2 smep bmi2 erms invpcid xsaveopt -+bogomips : 5800.06 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 1 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 63 -+model name : Intel(R) Xeon(R) CPU E5-2666 v3 @ 2.90GHz -+stepping : 2 -+microcode : 0x3c -+cpu MHz : 2900.281 -+cache size : 25600 KB -+physical id : 0 -+siblings : 2 -+core id : 0 -+cpu cores : 1 -+apicid : 1 -+initial apicid : 1 -+fpu : yes -+fpu_exception : yes -+cpuid level : 13 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology eagerfpu pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm fsgsbase bmi1 avx2 smep bmi2 erms invpcid xsaveopt -+bogomips : 5800.06 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -diff --git a/tests/aws-xen-x86/proc/self/status b/tests/aws-xen-x86/proc/self/status -new file mode 100644 -index 0000000..4e93816 ---- /dev/null -+++ b/tests/aws-xen-x86/proc/self/status -@@ -0,0 +1,46 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 22828 -+Ngid: 0 -+Pid: 22828 -+PPid: 17431 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 256 -+Groups: 0 -+VmPeak: 107972 kB -+VmSize: 107972 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 360 kB -+VmRSS: 360 kB -+RssAnon: 76 kB -+RssFile: 284 kB -+RssShmem: 0 kB -+VmData: 180 kB -+VmStk: 132 kB -+VmExe: 44 kB -+VmLib: 1936 kB -+VmPTE: 36 kB -+VmSwap: 0 kB -+Threads: 1 -+SigQ: 0/14231 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000001fffffffff -+CapEff: 0000001fffffffff -+CapBnd: 0000001fffffffff -+CapAmb: 0000000000000000 -+Seccomp: 0 -+Cpus_allowed: 7fff -+Cpus_allowed_list: 0-14 -+Mems_allowed: 00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 1 -+nonvoluntary_ctxt_switches: 1 -diff --git a/tests/aws-xen-x86/sbin/dmidecode b/tests/aws-xen-x86/sbin/dmidecode -new file mode 100755 -index 0000000..bc9cde5 ---- /dev/null -+++ b/tests/aws-xen-x86/sbin/dmidecode -@@ -0,0 +1,135 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.0 -+Getting SMBIOS data from sysfs. -+SMBIOS 2.7 present. -+12 structures occupying 398 bytes. -+Table at 0x000EB01F. -+ -+Handle 0x0000, DMI type 0, 24 bytes -+BIOS Information -+ Vendor: Xen -+ Version: 4.2.amazon -+ Release Date: 08/24/2006 -+ Address: 0xE8000 -+ Runtime Size: 96 kB -+ ROM Size: 64 kB -+ Characteristics: -+ PCI is supported -+ EDD is supported -+ Targeted content distribution is supported -+ BIOS Revision: 4.2 -+ -+Handle 0x0100, DMI type 1, 27 bytes -+System Information -+ Manufacturer: Xen -+ Product Name: HVM domU -+ Version: 4.2.amazon -+ Serial Number: ec2f5c70-6dfc-83a7-f5ec-ef7b97aea4c9 -+ UUID: EC2F5C70-6DFC-83A7-F5EC-EF7B97AEA4C9 -+ Wake-up Type: Power Switch -+ SKU Number: Not Specified -+ Family: Not Specified -+ -+Handle 0x0300, DMI type 3, 13 bytes -+Chassis Information -+ Manufacturer: Xen -+ Type: Other -+ Lock: Not Present -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Boot-up State: Safe -+ Power Supply State: Safe -+ Thermal State: Safe -+ Security Status: Unknown -+ -+Handle 0x0401, DMI type 4, 26 bytes -+Processor Information -+ Socket Designation: CPU 1 -+ Type: Central Processor -+ Family: Other -+ Manufacturer: Intel -+ ID: F2 06 03 00 FF FB 89 17 -+ Version: Not Specified -+ Voltage: Unknown -+ External Clock: Unknown -+ Max Speed: 2900 MHz -+ Current Speed: 2900 MHz -+ Status: Populated, Enabled -+ Upgrade: Other -+ -+Handle 0x0402, DMI type 4, 26 bytes -+Processor Information -+ Socket Designation: CPU 2 -+ Type: Central Processor -+ Family: Other -+ Manufacturer: Intel -+ ID: F2 06 03 00 FF FB 89 17 -+ Version: Not Specified -+ Voltage: Unknown -+ External Clock: Unknown -+ Max Speed: 2900 MHz -+ Current Speed: 2900 MHz -+ Status: Populated, Enabled -+ Upgrade: Other -+ -+Handle 0x0B00, DMI type 11, 5 bytes -+OEM Strings -+ String 1: Xen -+ -+Handle 0x1000, DMI type 16, 19 bytes -+Physical Memory Array -+ Location: Other -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 3840 MB -+ Error Information Handle: Not Provided -+ Number Of Devices: 1 -+ -+Handle 0x1100, DMI type 17, 34 bytes -+Memory Device -+ Array Handle: 0x1000 -+ Error Information Handle: 0x0000 -+ Total Width: 64 bits -+ Data Width: 64 bits -+ Size: 3840 MB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM 0 -+ Bank Locator: Not Specified -+ Type: RAM -+ Type Detail: None -+ Speed: Unknown -+ Manufacturer: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Rank: Unknown -+ Configured Clock Speed: Unknown -+ -+Handle 0x1300, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x00000000000 -+ Ending Address: 0x000EFFFFFFF -+ Range Size: 3840 MB -+ Physical Array Handle: 0x1000 -+ Partition Width: 1 -+ -+Handle 0x1400, DMI type 20, 35 bytes -+Memory Device Mapped Address -+ Starting Address: 0x00000000000 -+ Ending Address: 0x000EFFFFFFF -+ Range Size: 3840 MB -+ Physical Device Handle: 0x1100 -+ Memory Array Mapped Address Handle: 0x1300 -+ Partition Row Position: 1 -+ -+Handle 0x2000, DMI type 32, 11 bytes -+System Boot Information -+ Status: No errors detected -+ -+Handle 0x7F00, DMI type 127, 4 bytes -+End Of Table -+ -+EOF -diff --git a/tests/aws-xen-x86/sbin/uname b/tests/aws-xen-x86/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/aws-xen-x86/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/aws-xen-x86/sbin/virt-what-cpuid-helper b/tests/aws-xen-x86/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..8d8df4a ---- /dev/null -+++ b/tests/aws-xen-x86/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo XenVMMXenVMM -diff --git a/tests/test-aws-xen-x86.sh b/tests/test-aws-xen-x86.sh -new file mode 100755 -index 0000000..22b7f83 ---- /dev/null -+++ b/tests/test-aws-xen-x86.sh -@@ -0,0 +1,36 @@ -+# Test for AWS. -+# Copyright (C) 2018 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+root=tests/aws-xen-x86 -+ -+output="$(./virt-what --test-root=$root 2>&1)" -+expected="xen -+xen-hvm -+aws" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi --- -2.31.1 - diff --git a/SOURCES/0013-aws-Add-regression-test-for-AWS-on-KVM-on-ARM-archit.patch b/SOURCES/0013-aws-Add-regression-test-for-AWS-on-KVM-on-ARM-archit.patch deleted file mode 100644 index 0d9b13a..0000000 --- a/SOURCES/0013-aws-Add-regression-test-for-AWS-on-KVM-on-ARM-archit.patch +++ /dev/null @@ -1,244 +0,0 @@ -From f25e07d43db40355b321493f78758ea058fa3849 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Oct 2018 15:23:45 +0000 -Subject: [PATCH 13/36] aws: Add regression test for AWS on KVM on ARM - architecture. - ---- - Makefile.am | 1 + - tests/aws-kvm-arm/proc/cpuinfo | 9 +++ - tests/aws-kvm-arm/proc/self/status | 54 +++++++++++++++ - tests/aws-kvm-arm/sbin/dmidecode | 68 +++++++++++++++++++ - tests/aws-kvm-arm/sbin/uname | 2 + - tests/aws-kvm-arm/sbin/virt-what-cpuid-helper | 2 + - tests/test-aws-kvm-arm.sh | 36 ++++++++++ - 7 files changed, 172 insertions(+) - create mode 100644 tests/aws-kvm-arm/proc/cpuinfo - create mode 100644 tests/aws-kvm-arm/proc/self/status - create mode 100755 tests/aws-kvm-arm/sbin/dmidecode - create mode 100755 tests/aws-kvm-arm/sbin/uname - create mode 100755 tests/aws-kvm-arm/sbin/virt-what-cpuid-helper - create mode 100755 tests/test-aws-kvm-arm.sh - -diff --git a/Makefile.am b/Makefile.am -index 22680a0..67502fc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -40,6 +40,7 @@ endif - - TESTS = \ - tests/test-aws-baremetal-x86.sh \ -+ tests/test-aws-kvm-arm.sh \ - tests/test-aws-kvm-x86.sh \ - tests/test-aws-xen-x86.sh \ - tests/test-baremetal.sh \ -diff --git a/tests/aws-kvm-arm/proc/cpuinfo b/tests/aws-kvm-arm/proc/cpuinfo -new file mode 100644 -index 0000000..bc5a5bb ---- /dev/null -+++ b/tests/aws-kvm-arm/proc/cpuinfo -@@ -0,0 +1,9 @@ -+processor : 0 -+BogoMIPS : 166.66 -+Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid -+CPU implementer : 0x41 -+CPU architecture: 8 -+CPU variant : 0x0 -+CPU part : 0xd08 -+CPU revision : 3 -+ -diff --git a/tests/aws-kvm-arm/proc/self/status b/tests/aws-kvm-arm/proc/self/status -new file mode 100644 -index 0000000..121a8cc ---- /dev/null -+++ b/tests/aws-kvm-arm/proc/self/status -@@ -0,0 +1,54 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 17874 -+Ngid: 0 -+Pid: 17874 -+PPid: 9992 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 256 -+Groups: 0 -+NStgid: 17874 -+NSpid: 17874 -+NSpgid: 17874 -+NSsid: 9992 -+VmPeak: 109760 kB -+VmSize: 109760 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 832 kB -+VmRSS: 832 kB -+RssAnon: 448 kB -+RssFile: 384 kB -+RssShmem: 0 kB -+VmData: 384 kB -+VmStk: 192 kB -+VmExe: 64 kB -+VmLib: 1664 kB -+VmPTE: 192 kB -+VmPMD: 128 kB -+VmSwap: 0 kB -+HugetlbPages: 0 kB -+Threads: 1 -+SigQ: 0/1470 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000003fffffffff -+CapEff: 0000003fffffffff -+CapBnd: 0000003fffffffff -+CapAmb: 0000000000000000 -+NoNewPrivs: 0 -+Seccomp: 0 -+Speculation Store Bypass: unknown -+Cpus_allowed: 1 -+Cpus_allowed_list: 0 -+Mems_allowed: 1 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 0 -+nonvoluntary_ctxt_switches: 0 -diff --git a/tests/aws-kvm-arm/sbin/dmidecode b/tests/aws-kvm-arm/sbin/dmidecode -new file mode 100755 -index 0000000..d126758 ---- /dev/null -+++ b/tests/aws-kvm-arm/sbin/dmidecode -@@ -0,0 +1,68 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.1 -+Getting SMBIOS data from sysfs. -+SMBIOS 2.7 present. -+5 structures occupying 233 bytes. -+Table at 0x7F780000. -+ -+Handle 0x0000, DMI type 0, 24 bytes -+BIOS Information -+ Vendor: Amazon EC2 -+ Version: 1.0 -+ Release Date: 12/1/2018 -+ Address: 0xF0000 -+ Runtime Size: 64 kB -+ ROM Size: 64 kB -+ Characteristics: -+ PCI is supported -+ EDD is supported -+ ACPI is supported -+ System is a virtual machine -+ BIOS Revision: 1.0 -+ -+Handle 0x0001, DMI type 1, 27 bytes -+System Information -+ Manufacturer: Amazon EC2 -+ Product Name: a1.medium -+ Version: Not Specified -+ Serial Number: ec2ce86a-12c2-9388-d9b0-8dc833cba752 -+ UUID: ec2ce86a-12c2-9388-d9b0-8dc833cba752 -+ Wake-up Type: Power Switch -+ SKU Number: Not Specified -+ Family: Not Specified -+ -+Handle 0x0002, DMI type 2, 15 bytes -+Base Board Information -+ Manufacturer: Amazon EC2 -+ Product Name: Not Specified -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: i-01c1b85d3dcc02ed7 -+ Features: None -+ Location In Chassis: Not Specified -+ Chassis Handle: 0x0003 -+ Type: Other -+ Contained Object Handles: 0 -+ -+Handle 0x0003, DMI type 3, 21 bytes -+Chassis Information -+ Manufacturer: Amazon EC2 -+ Type: Other -+ Lock: Not Present -+ Version: Not Specified -+ Serial Number: Not Specified -+ Asset Tag: Amazon EC2 -+ Boot-up State: Safe -+ Power Supply State: Safe -+ Thermal State: Safe -+ Security Status: None -+ OEM Information: 0x00000000 -+ Height: Unspecified -+ Number Of Power Cords: 1 -+ Contained Elements: 0 -+ -+Handle 0xFEFF, DMI type 127, 4 bytes -+End Of Table -+ -+EOF -diff --git a/tests/aws-kvm-arm/sbin/uname b/tests/aws-kvm-arm/sbin/uname -new file mode 100755 -index 0000000..bd33a2d ---- /dev/null -+++ b/tests/aws-kvm-arm/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo aarch64 -diff --git a/tests/aws-kvm-arm/sbin/virt-what-cpuid-helper b/tests/aws-kvm-arm/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..4475399 ---- /dev/null -+++ b/tests/aws-kvm-arm/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+# prints nothing but exits successfully -diff --git a/tests/test-aws-kvm-arm.sh b/tests/test-aws-kvm-arm.sh -new file mode 100755 -index 0000000..8875421 ---- /dev/null -+++ b/tests/test-aws-kvm-arm.sh -@@ -0,0 +1,36 @@ -+# Test for AWS. -+# Copyright (C) 2018 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+root=tests/aws-kvm-arm -+ -+output="$(./virt-what --test-root=$root 2>&1)" -+# XXX At the moment KVM cannot be detected on this platform. -+# We hope to fix that, but for now the only fact printed is "aws". -+expected="aws" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi --- -2.31.1 - diff --git a/SOURCES/0014-build-Remove-files-on-make-clean.patch b/SOURCES/0014-build-Remove-files-on-make-clean.patch deleted file mode 100644 index df8246e..0000000 --- a/SOURCES/0014-build-Remove-files-on-make-clean.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 56427ce169d5a6dc46ed6c6555ee3f7c4e0843d6 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 3 Oct 2019 09:08:19 +0100 -Subject: [PATCH 14/36] build: Remove *~ files on make clean. - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 67502fc..48fd518 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -15,7 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --CLEANFILES = virt-what -+CLEANFILES = virt-what *~ - - AM_CPPFLAGS = -Wall - --- -2.31.1 - diff --git a/SOURCES/0015-Arrange-tests-in-subdirectories.patch b/SOURCES/0015-Arrange-tests-in-subdirectories.patch deleted file mode 100644 index ab90190..0000000 --- a/SOURCES/0015-Arrange-tests-in-subdirectories.patch +++ /dev/null @@ -1,2386 +0,0 @@ -From e3eeddbc857a5647135c42c97be75198929a8ce1 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 3 Oct 2019 09:53:49 +0100 -Subject: [PATCH 15/36] Arrange tests in subdirectories. - -This simplifies and isolates each test. ---- - .gitignore | 6 +- - Makefile.am | 263 +----------------- - configure.ac | 77 ++++- - tests/Makefile.am | 20 ++ - tests/aws-baremetal-x86/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/aws-kvm-arm/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/aws-kvm-x86/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/aws-xen-x86/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/baremetal/Makefile.am | 28 ++ - .../{test-baremetal.sh => baremetal/test.sh} | 4 +- - tests/bhyve/Makefile.am | 27 ++ - tests/{test-bhyve.sh => bhyve/test.sh} | 4 +- - tests/docker/Makefile.am | 29 ++ - tests/{test-docker.sh => docker/test.sh} | 4 +- - tests/esx4.1/Makefile.am | 28 ++ - tests/{test-esx4.1.sh => esx4.1/test.sh} | 4 +- - tests/hyperv/Makefile.am | 28 ++ - tests/{test-hyperv.sh => hyperv/test.sh} | 4 +- - tests/kvm-explicit-cpu/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/kvm/Makefile.am | 28 ++ - tests/{test-kvm.sh => kvm/test.sh} | 4 +- - tests/ldoms/Makefile.am | 28 ++ - tests/{test-ldoms.sh => ldoms/test.sh} | 4 +- - tests/linux-vserver/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/lkvm-arm/Makefile.am | 29 ++ - tests/{test-lkvm-arm.sh => lkvm-arm/test.sh} | 4 +- - tests/lkvm/Makefile.am | 28 ++ - tests/{test-lkvm.sh => lkvm/test.sh} | 4 +- - tests/lx86/Makefile.am | 28 ++ - tests/{test-lx86.sh => lx86/test.sh} | 4 +- - tests/lxc/Makefile.am | 29 ++ - tests/{test-lxc.sh => lxc/test.sh} | 4 +- - tests/parallels-desktop/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/ppc64-baremetal/Makefile.am | 27 ++ - .../test.sh} | 4 +- - tests/ppc64-kvm/Makefile.am | 28 ++ - .../{test-ppc64-kvm.sh => ppc64-kvm/test.sh} | 4 +- - tests/ppc64-lpar-dedicated/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/ppc64-lpar-shared/Makefile.am | 29 ++ - .../test.sh} | 4 +- - tests/qemu-arm/Makefile.am | 29 ++ - tests/{test-qemu-arm.sh => qemu-arm/test.sh} | 4 +- - tests/qemu-smbios-kvm/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/qemu-smbios/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/qemu/Makefile.am | 28 ++ - tests/{test-qemu.sh => qemu/test.sh} | 4 +- - tests/rhel5-xen-dom0/Makefile.am | 48 ++++ - .../test.sh} | 4 +- - tests/rhel5-xen-domU-hvm-ia64/Makefile.am | 33 +++ - .../test.sh} | 4 +- - tests/rhel5-xen-domU-hvm/Makefile.am | 28 ++ - .../test.sh} | 4 +- - tests/rhel5-xen-domU-pv/Makefile.am | 46 +++ - .../test.sh} | 4 +- - tests/rhev/Makefile.am | 28 ++ - tests/{test-rhev.sh => rhev/test.sh} | 4 +- - tests/vmm/Makefile.am | 27 ++ - tests/{test-vmm.sh => vmm/test.sh} | 4 +- - tests/xen-arm/Makefile.am | 29 ++ - tests/{test-xen-arm.sh => xen-arm/test.sh} | 4 +- - tests/zvm/Makefile.am | 29 ++ - tests/{test-zvm.sh => zvm/test.sh} | 4 +- - 72 files changed, 1139 insertions(+), 362 deletions(-) - create mode 100644 tests/Makefile.am - create mode 100644 tests/aws-baremetal-x86/Makefile.am - rename tests/{test-aws-baremetal-x86.sh => aws-baremetal-x86/test.sh} (93%) - create mode 100644 tests/aws-kvm-arm/Makefile.am - rename tests/{test-aws-kvm-arm.sh => aws-kvm-arm/test.sh} (94%) - create mode 100644 tests/aws-kvm-x86/Makefile.am - rename tests/{test-aws-kvm-x86.sh => aws-kvm-x86/test.sh} (94%) - create mode 100644 tests/aws-xen-x86/Makefile.am - rename tests/{test-aws-xen-x86.sh => aws-xen-x86/test.sh} (94%) - create mode 100644 tests/baremetal/Makefile.am - rename tests/{test-baremetal.sh => baremetal/test.sh} (94%) - create mode 100644 tests/bhyve/Makefile.am - rename tests/{test-bhyve.sh => bhyve/test.sh} (94%) - create mode 100644 tests/docker/Makefile.am - rename tests/{test-docker.sh => docker/test.sh} (94%) - create mode 100644 tests/esx4.1/Makefile.am - rename tests/{test-esx4.1.sh => esx4.1/test.sh} (94%) - create mode 100644 tests/hyperv/Makefile.am - rename tests/{test-hyperv.sh => hyperv/test.sh} (94%) - create mode 100644 tests/kvm-explicit-cpu/Makefile.am - rename tests/{test-kvm-explicit-cpu.sh => kvm-explicit-cpu/test.sh} (94%) - create mode 100644 tests/kvm/Makefile.am - rename tests/{test-kvm.sh => kvm/test.sh} (95%) - create mode 100644 tests/ldoms/Makefile.am - rename tests/{test-ldoms.sh => ldoms/test.sh} (94%) - create mode 100644 tests/linux-vserver/Makefile.am - rename tests/{test-linux-vserver.sh => linux-vserver/test.sh} (94%) - create mode 100644 tests/lkvm-arm/Makefile.am - rename tests/{test-lkvm-arm.sh => lkvm-arm/test.sh} (94%) - create mode 100644 tests/lkvm/Makefile.am - rename tests/{test-lkvm.sh => lkvm/test.sh} (94%) - create mode 100644 tests/lx86/Makefile.am - rename tests/{test-lx86.sh => lx86/test.sh} (95%) - create mode 100644 tests/lxc/Makefile.am - rename tests/{test-lxc.sh => lxc/test.sh} (95%) - create mode 100644 tests/parallels-desktop/Makefile.am - rename tests/{test-parallels-desktop.sh => parallels-desktop/test.sh} (94%) - create mode 100644 tests/ppc64-baremetal/Makefile.am - rename tests/{test-ppc64-baremetal.sh => ppc64-baremetal/test.sh} (94%) - create mode 100644 tests/ppc64-kvm/Makefile.am - rename tests/{test-ppc64-kvm.sh => ppc64-kvm/test.sh} (94%) - create mode 100644 tests/ppc64-lpar-dedicated/Makefile.am - rename tests/{test-ppc64-lpar-dedicated.sh => ppc64-lpar-dedicated/test.sh} (94%) - create mode 100644 tests/ppc64-lpar-shared/Makefile.am - rename tests/{test-ppc64-lpar-shared.sh => ppc64-lpar-shared/test.sh} (94%) - create mode 100644 tests/qemu-arm/Makefile.am - rename tests/{test-qemu-arm.sh => qemu-arm/test.sh} (94%) - create mode 100644 tests/qemu-smbios-kvm/Makefile.am - rename tests/{test-qemu-smbios-kvm.sh => qemu-smbios-kvm/test.sh} (94%) - create mode 100644 tests/qemu-smbios/Makefile.am - rename tests/{test-qemu-smbios.sh => qemu-smbios/test.sh} (94%) - create mode 100644 tests/qemu/Makefile.am - rename tests/{test-qemu.sh => qemu/test.sh} (94%) - create mode 100644 tests/rhel5-xen-dom0/Makefile.am - rename tests/{test-rhel5-xen-dom0.sh => rhel5-xen-dom0/test.sh} (94%) - create mode 100644 tests/rhel5-xen-domU-hvm-ia64/Makefile.am - rename tests/{test-rhel5-xen-domU-hvm-ia64.sh => rhel5-xen-domU-hvm-ia64/test.sh} (93%) - create mode 100644 tests/rhel5-xen-domU-hvm/Makefile.am - rename tests/{test-rhel5-xen-domU-hvm.sh => rhel5-xen-domU-hvm/test.sh} (94%) - create mode 100644 tests/rhel5-xen-domU-pv/Makefile.am - rename tests/{test-rhel5-xen-domU-pv.sh => rhel5-xen-domU-pv/test.sh} (94%) - create mode 100644 tests/rhev/Makefile.am - rename tests/{test-rhev.sh => rhev/test.sh} (94%) - create mode 100644 tests/vmm/Makefile.am - rename tests/{test-vmm.sh => vmm/test.sh} (95%) - create mode 100644 tests/xen-arm/Makefile.am - rename tests/{test-xen-arm.sh => xen-arm/test.sh} (94%) - create mode 100644 tests/zvm/Makefile.am - rename tests/{test-zvm.sh => zvm/test.sh} (95%) - -diff --git a/.gitignore b/.gitignore -index f565f34..4833fd6 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,12 +1,14 @@ - *~ -+*.bak - *.log - *.trs - *.o - -+Makefile -+Makefile.in -+ - /virt-what-*.tar.gz - /.deps --/Makefile --/Makefile.in - /aclocal.m4 - /autom4te.cache - /compile -diff --git a/Makefile.am b/Makefile.am -index 48fd518..b62738f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -15,10 +15,14 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --CLEANFILES = virt-what *~ -- - AM_CPPFLAGS = -Wall - -+CLEANFILES = virt-what *~ -+ -+EXTRA_DIST = virt-what.in virt-what.pod -+ -+SUBDIRS = . tests -+ - sbin_SCRIPTS = virt-what - libexec_PROGRAMS = virt-what-cpuid-helper - if HOST_CPU_IA64 -@@ -37,258 +41,3 @@ virt-what.txt: virt-what.pod - pod2text $? > $@ - - endif -- --TESTS = \ -- tests/test-aws-baremetal-x86.sh \ -- tests/test-aws-kvm-arm.sh \ -- tests/test-aws-kvm-x86.sh \ -- tests/test-aws-xen-x86.sh \ -- tests/test-baremetal.sh \ -- tests/test-bhyve.sh \ -- tests/test-docker.sh \ -- tests/test-esx4.1.sh \ -- tests/test-hyperv.sh \ -- tests/test-kvm.sh \ -- tests/test-kvm-explicit-cpu.sh \ -- tests/test-linux-vserver.sh \ -- tests/test-ldoms.sh \ -- tests/test-lkvm.sh \ -- tests/test-lkvm-arm.sh \ -- tests/test-lxc.sh \ -- tests/test-lx86.sh \ -- tests/test-parallels-desktop.sh \ -- tests/test-ppc64-baremetal.sh \ -- tests/test-ppc64-kvm.sh \ -- tests/test-ppc64-lpar-dedicated.sh \ -- tests/test-ppc64-lpar-shared.sh \ -- tests/test-qemu.sh \ -- tests/test-qemu-arm.sh \ -- tests/test-qemu-smbios.sh \ -- tests/test-qemu-smbios-kvm.sh \ -- tests/test-rhel5-xen-dom0.sh \ -- tests/test-rhel5-xen-domU-hvm.sh \ -- tests/test-rhel5-xen-domU-hvm-ia64.sh \ -- tests/test-rhel5-xen-domU-pv.sh \ -- tests/test-rhev.sh \ -- tests/test-vmm.sh \ -- tests/test-xen-arm.sh \ -- tests/test-zvm.sh -- --EXTRA_DIST = \ -- virt-what.in \ -- virt-what.pod \ -- tests/aws-baremetal-x86/proc/cpuinfo \ -- tests/aws-baremetal-x86/proc/self/status \ -- tests/aws-baremetal-x86/sbin/dmidecode \ -- tests/aws-baremetal-x86/sbin/uname \ -- tests/aws-baremetal-x86/sbin/virt-what-cpuid-helper \ -- tests/aws-kvm-x86/proc/cpuinfo \ -- tests/aws-kvm-x86/proc/self/status \ -- tests/aws-kvm-x86/sbin/dmidecode \ -- tests/aws-kvm-x86/sbin/uname \ -- tests/aws-kvm-x86/sbin/virt-what-cpuid-helper \ -- tests/aws-xen-x86/proc/cpuinfo \ -- tests/aws-xen-x86/proc/self/status \ -- tests/aws-xen-x86/sbin/dmidecode \ -- tests/aws-xen-x86/sbin/uname \ -- tests/aws-xen-x86/sbin/virt-what-cpuid-helper \ -- tests/baremetal/proc/cpuinfo \ -- tests/baremetal/proc/self/status \ -- tests/baremetal/sbin/dmidecode \ -- tests/baremetal/sbin/uname \ -- tests/baremetal/sbin/virt-what-cpuid-helper \ -- tests/bhyve/proc/cpuinfo \ -- tests/bhyve/sbin/dmidecode \ -- tests/bhyve/sbin/uname \ -- tests/bhyve/sbin/virt-what-cpuid-helper \ -- tests/docker/.dockerinit \ -- tests/docker/proc/cpuinfo \ -- tests/docker/proc/self/status \ -- tests/docker/sbin/dmidecode \ -- tests/docker/sbin/uname \ -- tests/docker/sbin/virt-what-cpuid-helper \ -- tests/esx4.1/proc/cpuinfo \ -- tests/esx4.1/proc/self/status \ -- tests/esx4.1/sbin/dmidecode \ -- tests/esx4.1/sbin/uname \ -- tests/esx4.1/sbin/virt-what-cpuid-helper \ -- tests/hyperv/proc/cpuinfo \ -- tests/hyperv/proc/self/status \ -- tests/hyperv/sbin/dmidecode \ -- tests/hyperv/sbin/uname \ -- tests/hyperv/sbin/virt-what-cpuid-helper \ -- tests/kvm/proc/cpuinfo \ -- tests/kvm/proc/self/status \ -- tests/kvm/sbin/dmidecode \ -- tests/kvm/sbin/uname \ -- tests/kvm/sbin/virt-what-cpuid-helper \ -- tests/kvm-explicit-cpu/proc/cpuinfo \ -- tests/kvm-explicit-cpu/proc/self/status \ -- tests/kvm-explicit-cpu/sbin/dmidecode \ -- tests/kvm-explicit-cpu/sbin/uname \ -- tests/kvm-explicit-cpu/sbin/virt-what-cpuid-helper \ -- tests/ldoms/dev/mdesc \ -- tests/ldoms/proc/cpuinfo \ -- tests/ldoms/sbin/uname \ -- tests/ldoms/sbin/virt-what-cpuid-helper \ -- tests/linux-vserver/proc/cpuinfo \ -- tests/linux-vserver/proc/self/status \ -- tests/linux-vserver/sbin/dmidecode \ -- tests/linux-vserver/sbin/uname \ -- tests/linux-vserver/sbin/virt-what-cpuid-helper \ -- tests/lkvm/proc/cpuinfo \ -- tests/lkvm/proc/self/status \ -- tests/lkvm/sbin/dmidecode \ -- tests/lkvm/sbin/uname \ -- tests/lkvm/sbin/virt-what-cpuid-helper \ -- tests/lkvm-arm/proc/cpuinfo \ -- tests/lkvm-arm/proc/device-tree/compatible \ -- tests/lkvm-arm/proc/self/status \ -- tests/lkvm-arm/sbin/dmidecode \ -- tests/lkvm-arm/sbin/uname \ -- tests/lkvm-arm/sbin/virt-what-cpuid-helper \ -- tests/lxc/proc/1/environ \ -- tests/lxc/proc/cpuinfo \ -- tests/lxc/proc/self/status \ -- tests/lxc/sbin/dmidecode \ -- tests/lxc/sbin/uname \ -- tests/lxc/sbin/virt-what-cpuid-helper \ -- tests/lx86/proc/cpuinfo \ -- tests/lx86/proc/self/status \ -- tests/lx86/sbin/dmidecode \ -- tests/lx86/sbin/uname \ -- tests/lx86/sbin/virt-what-cpuid-helper \ -- tests/parallels-desktop/proc/cpuinfo \ -- tests/parallels-desktop/proc/self/status \ -- tests/parallels-desktop/sbin/dmidecode \ -- tests/parallels-desktop/sbin/uname \ -- tests/parallels-desktop/sbin/virt-what-cpuid-helper \ -- tests/ppc64-baremetal/proc/cpuinfo \ -- tests/ppc64-baremetal/sbin/dmidecode \ -- tests/ppc64-baremetal/sbin/uname \ -- tests/ppc64-baremetal/sbin/virt-what-cpuid-helper \ -- tests/ppc64-kvm/proc/cpuinfo \ -- tests/ppc64-kvm/proc/self/status \ -- tests/ppc64-kvm/sbin/dmidecode \ -- tests/ppc64-kvm/sbin/uname \ -- tests/ppc64-kvm/sbin/virt-what-cpuid-helper \ -- tests/ppc64-lpar-dedicated/proc/cpuinfo \ -- tests/ppc64-lpar-dedicated/proc/ppc64/lparcfg \ -- tests/ppc64-lpar-dedicated/sbin/dmidecode \ -- tests/ppc64-lpar-dedicated/sbin/uname \ -- tests/ppc64-lpar-dedicated/sbin/virt-what-cpuid-helper \ -- tests/ppc64-lpar-shared/sbin/dmidecode \ -- tests/ppc64-lpar-shared/sbin/uname \ -- tests/ppc64-lpar-shared/sbin/virt-what-cpuid-helper \ -- tests/ppc64-lpar-shared/proc/cpuinfo \ -- tests/ppc64-lpar-shared/proc/self/status \ -- tests/ppc64-lpar-shared/proc/ppc64/lparcfg \ -- tests/ppc64-lpar-shared/sbin/dmidecode \ -- tests/ppc64-lpar-shared/sbin/uname \ -- tests/ppc64-lpar-shared/sbin/virt-what-cpuid-helper \ -- tests/qemu/proc/cpuinfo \ -- tests/qemu/proc/self/status \ -- tests/qemu/sbin/dmidecode \ -- tests/qemu/sbin/uname \ -- tests/qemu/sbin/virt-what-cpuid-helper \ -- tests/qemu-arm/proc/cpuinfo \ -- tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible \ -- tests/qemu-arm/proc/self/status \ -- tests/qemu-arm/sbin/dmidecode \ -- tests/qemu-arm/sbin/uname \ -- tests/qemu-arm/sbin/virt-what-cpuid-helper \ -- tests/qemu-smbios/proc/cpuinfo \ -- tests/qemu-smbios/proc/self/status \ -- tests/qemu-smbios/sbin/dmidecode \ -- tests/qemu-smbios/sbin/uname \ -- tests/qemu-smbios/sbin/virt-what-cpuid-helper \ -- tests/qemu-smbios-kvm/proc/cpuinfo \ -- tests/qemu-smbios-kvm/proc/self/status \ -- tests/qemu-smbios-kvm/sbin/dmidecode \ -- tests/qemu-smbios-kvm/sbin/uname \ -- tests/qemu-smbios-kvm/sbin/virt-what-cpuid-helper \ -- tests/rhel5-xen-dom0/proc/cpuinfo \ -- tests/rhel5-xen-dom0/proc/self/status \ -- tests/rhel5-xen-dom0/proc/xen/balloon \ -- tests/rhel5-xen-dom0/proc/xen/capabilities \ -- tests/rhel5-xen-dom0/proc/xen/privcmd \ -- tests/rhel5-xen-dom0/proc/xen/xenbus \ -- tests/rhel5-xen-dom0/proc/xen/xsd_kva \ -- tests/rhel5-xen-dom0/proc/xen/xsd_port \ -- tests/rhel5-xen-dom0/sbin/dmidecode \ -- tests/rhel5-xen-dom0/sbin/uname \ -- tests/rhel5-xen-dom0/sbin/virt-what-cpuid-helper \ -- tests/rhel5-xen-dom0/sys/hypervisor/properties/pagesize \ -- tests/rhel5-xen-dom0/sys/hypervisor/properties/changeset \ -- tests/rhel5-xen-dom0/sys/hypervisor/properties/virtual_start \ -- tests/rhel5-xen-dom0/sys/hypervisor/properties/capabilities \ -- tests/rhel5-xen-dom0/sys/hypervisor/properties/writable_pt \ -- tests/rhel5-xen-dom0/sys/hypervisor/type \ -- tests/rhel5-xen-dom0/sys/hypervisor/vmcoreinfo \ -- tests/rhel5-xen-dom0/sys/hypervisor/version/minor \ -- tests/rhel5-xen-dom0/sys/hypervisor/version/major \ -- tests/rhel5-xen-dom0/sys/hypervisor/version/extra \ -- tests/rhel5-xen-dom0/sys/hypervisor/compilation/compiler \ -- tests/rhel5-xen-dom0/sys/hypervisor/compilation/compiled_by \ -- tests/rhel5-xen-dom0/sys/hypervisor/compilation/compile_date \ -- tests/rhel5-xen-dom0/sys/hypervisor/uuid \ -- tests/rhel5-xen-domU-hvm/proc/cpuinfo \ -- tests/rhel5-xen-domU-hvm/proc/self/status \ -- tests/rhel5-xen-domU-hvm/sbin/dmidecode \ -- tests/rhel5-xen-domU-hvm/sbin/uname \ -- tests/rhel5-xen-domU-hvm/sbin/virt-what-cpuid-helper \ -- tests/rhel5-xen-domU-hvm-ia64/proc/cpuinfo \ -- tests/rhel5-xen-domU-hvm-ia64/proc/self/status \ -- tests/rhel5-xen-domU-hvm-ia64/sbin/dmidecode \ -- tests/rhel5-xen-domU-hvm-ia64/sbin/uname \ -- tests/rhel5-xen-domU-hvm-ia64/sbin/virt-what-cpuid-helper \ -- tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vbd/bind \ -- tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vbd/unbind \ -- tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vif/bind \ -- tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers/vif/unbind \ -- tests/rhel5-xen-domU-hvm-ia64/sys/bus/xen/drivers_probe \ -- tests/rhel5-xen-domU-pv/proc/cpuinfo \ -- tests/rhel5-xen-domU-pv/proc/self/status \ -- tests/rhel5-xen-domU-pv/proc/xen/balloon \ -- tests/rhel5-xen-domU-pv/proc/xen/capabilities \ -- tests/rhel5-xen-domU-pv/proc/xen/privcmd \ -- tests/rhel5-xen-domU-pv/proc/xen/xenbus \ -- tests/rhel5-xen-domU-pv/sbin/dmidecode \ -- tests/rhel5-xen-domU-pv/sbin/uname \ -- tests/rhel5-xen-domU-pv/sbin/virt-what-cpuid-helper \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/properties/pagesize \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/properties/changeset \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/properties/virtual_start \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/properties/capabilities \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/properties/writable_pt \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/type \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/vmcoreinfo \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/version/minor \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/version/major \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/version/extra \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compiler \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compiled_by \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compile_date \ -- tests/rhel5-xen-domU-pv/sys/hypervisor/uuid \ -- tests/rhev/proc/cpuinfo \ -- tests/rhev/proc/self/status \ -- tests/rhev/sbin/dmidecode \ -- tests/rhev/sbin/uname \ -- tests/rhev/sbin/virt-what-cpuid-helper \ -- tests/vmm/proc/cpuinfo \ -- tests/vmm/sbin/dmidecode \ -- tests/vmm/sbin/uname \ -- tests/vmm/sbin/virt-what-cpuid-helper \ -- tests/xen-arm/proc/cpuinfo \ -- tests/xen-arm/proc/device-tree/hypervisor/compatible \ -- tests/xen-arm/proc/self/status \ -- tests/xen-arm/sbin/dmidecode \ -- tests/xen-arm/sbin/uname \ -- tests/xen-arm/sbin/virt-what-cpuid-helper \ -- tests/zvm/proc/cpuinfo \ -- tests/zvm/proc/self/status \ -- tests/zvm/proc/sysinfo \ -- tests/zvm/sbin/dmidecode \ -- tests/zvm/sbin/uname \ -- tests/zvm/sbin/virt-what-cpuid-helper \ -- $(TESTS) -diff --git a/configure.ac b/configure.ac -index 3f16dba..5e0d9c4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,10 +32,85 @@ dnl Architecture we are compiling for. - AC_CANONICAL_HOST - AM_CONDITIONAL([HOST_CPU_IA64], [ test "x$host_cpu" = "xia64" ]) - -+dnl List of tests. -+tests="\ -+ aws-baremetal-x86 \ -+ aws-kvm-arm \ -+ aws-kvm-x86 \ -+ aws-xen-x86 \ -+ baremetal \ -+ bhyve \ -+ docker \ -+ esx4.1 \ -+ hyperv \ -+ kvm \ -+ kvm-explicit-cpu \ -+ ldoms \ -+ linux-vserver \ -+ lkvm \ -+ lkvm-arm \ -+ lx86 \ -+ lxc \ -+ parallels-desktop \ -+ ppc64-baremetal \ -+ ppc64-kvm \ -+ ppc64-lpar-dedicated \ -+ ppc64-lpar-shared \ -+ qemu \ -+ qemu-arm \ -+ qemu-smbios \ -+ qemu-smbios-kvm \ -+ rhel5-xen-dom0 \ -+ rhel5-xen-domU-hvm \ -+ rhel5-xen-domU-hvm-ia64 \ -+ rhel5-xen-domU-pv \ -+ rhev \ -+ vmm \ -+ xen-arm \ -+ zvm \ -+ " -+AC_SUBST([tests]) -+ - dnl Produce output files. - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_FILES([virt-what],[chmod +x virt-what]) --AC_CONFIG_FILES([Makefile]) -+AC_CONFIG_FILES([Makefile -+ tests/Makefile -+ tests/aws-baremetal-x86/Makefile -+ tests/aws-kvm-arm/Makefile -+ tests/aws-kvm-x86/Makefile -+ tests/aws-xen-x86/Makefile -+ tests/baremetal/Makefile -+ tests/bhyve/Makefile -+ tests/docker/Makefile -+ tests/esx4.1/Makefile -+ tests/hyperv/Makefile -+ tests/kvm/Makefile -+ tests/kvm-explicit-cpu/Makefile -+ tests/ldoms/Makefile -+ tests/linux-vserver/Makefile -+ tests/lkvm/Makefile -+ tests/lkvm-arm/Makefile -+ tests/lx86/Makefile -+ tests/lxc/Makefile -+ tests/parallels-desktop/Makefile -+ tests/ppc64-baremetal/Makefile -+ tests/ppc64-kvm/Makefile -+ tests/ppc64-lpar-dedicated/Makefile -+ tests/ppc64-lpar-shared/Makefile -+ tests/qemu/Makefile -+ tests/qemu-arm/Makefile -+ tests/qemu-smbios/Makefile -+ tests/qemu-smbios-kvm/Makefile -+ tests/rhel5-xen-dom0/Makefile -+ tests/rhel5-xen-domU-hvm/Makefile -+ tests/rhel5-xen-domU-hvm-ia64/Makefile -+ tests/rhel5-xen-domU-pv/Makefile -+ tests/rhev/Makefile -+ tests/vmm/Makefile -+ tests/xen-arm/Makefile -+ tests/zvm/Makefile -+ ]) - - AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man], [false]) - if test "$POD2MAN" = "false"; then -diff --git a/tests/Makefile.am b/tests/Makefile.am -new file mode 100644 -index 0000000..36bf918 ---- /dev/null -+++ b/tests/Makefile.am -@@ -0,0 +1,20 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+SUBDIRS = $(tests) -diff --git a/tests/aws-baremetal-x86/Makefile.am b/tests/aws-baremetal-x86/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/aws-baremetal-x86/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-aws-baremetal-x86.sh b/tests/aws-baremetal-x86/test.sh -similarity index 93% -rename from tests/test-aws-baremetal-x86.sh -rename to tests/aws-baremetal-x86/test.sh -index d456163..4a1e566 100755 ---- a/tests/test-aws-baremetal-x86.sh -+++ b/tests/aws-baremetal-x86/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/aws-baremetal-x86 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="aws" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/aws-kvm-arm/Makefile.am b/tests/aws-kvm-arm/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/aws-kvm-arm/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-aws-kvm-arm.sh b/tests/aws-kvm-arm/test.sh -similarity index 94% -rename from tests/test-aws-kvm-arm.sh -rename to tests/aws-kvm-arm/test.sh -index 8875421..5d31995 100755 ---- a/tests/test-aws-kvm-arm.sh -+++ b/tests/aws-kvm-arm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/aws-kvm-arm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - # XXX At the moment KVM cannot be detected on this platform. - # We hope to fix that, but for now the only fact printed is "aws". - expected="aws" -diff --git a/tests/aws-kvm-x86/Makefile.am b/tests/aws-kvm-x86/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/aws-kvm-x86/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-aws-kvm-x86.sh b/tests/aws-kvm-x86/test.sh -similarity index 94% -rename from tests/test-aws-kvm-x86.sh -rename to tests/aws-kvm-x86/test.sh -index db4c19f..133ef13 100755 ---- a/tests/test-aws-kvm-x86.sh -+++ b/tests/aws-kvm-x86/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/aws-kvm-x86 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="kvm - aws" - -diff --git a/tests/aws-xen-x86/Makefile.am b/tests/aws-xen-x86/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/aws-xen-x86/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-aws-xen-x86.sh b/tests/aws-xen-x86/test.sh -similarity index 94% -rename from tests/test-aws-xen-x86.sh -rename to tests/aws-xen-x86/test.sh -index 22b7f83..4ed4cde 100755 ---- a/tests/test-aws-xen-x86.sh -+++ b/tests/aws-xen-x86/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/aws-xen-x86 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="xen - xen-hvm - aws" -diff --git a/tests/baremetal/Makefile.am b/tests/baremetal/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/baremetal/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-baremetal.sh b/tests/baremetal/test.sh -similarity index 94% -rename from tests/test-baremetal.sh -rename to tests/baremetal/test.sh -index 1ca4bcf..d4a0c3f 100755 ---- a/tests/test-baremetal.sh -+++ b/tests/baremetal/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/baremetal -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/bhyve/Makefile.am b/tests/bhyve/Makefile.am -new file mode 100644 -index 0000000..0198c8f ---- /dev/null -+++ b/tests/bhyve/Makefile.am -@@ -0,0 +1,27 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-bhyve.sh b/tests/bhyve/test.sh -similarity index 94% -rename from tests/test-bhyve.sh -rename to tests/bhyve/test.sh -index a66b3b4..81cb9fe 100755 ---- a/tests/test-bhyve.sh -+++ b/tests/bhyve/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/bhyve -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="bhyve" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/docker/Makefile.am b/tests/docker/Makefile.am -new file mode 100644 -index 0000000..e0ea991 ---- /dev/null -+++ b/tests/docker/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ .dockerinit \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-docker.sh b/tests/docker/test.sh -similarity index 94% -rename from tests/test-docker.sh -rename to tests/docker/test.sh -index 4187f61..f09ad9f 100755 ---- a/tests/test-docker.sh -+++ b/tests/docker/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/docker -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="docker" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/esx4.1/Makefile.am b/tests/esx4.1/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/esx4.1/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-esx4.1.sh b/tests/esx4.1/test.sh -similarity index 94% -rename from tests/test-esx4.1.sh -rename to tests/esx4.1/test.sh -index 35c4e1d..0306a82 100755 ---- a/tests/test-esx4.1.sh -+++ b/tests/esx4.1/test.sh -@@ -16,9 +16,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/esx4.1 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="vmware" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/hyperv/Makefile.am b/tests/hyperv/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/hyperv/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-hyperv.sh b/tests/hyperv/test.sh -similarity index 94% -rename from tests/test-hyperv.sh -rename to tests/hyperv/test.sh -index 5015cc5..f84edf9 100755 ---- a/tests/test-hyperv.sh -+++ b/tests/hyperv/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/hyperv -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="hyperv" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/kvm-explicit-cpu/Makefile.am b/tests/kvm-explicit-cpu/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/kvm-explicit-cpu/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-kvm-explicit-cpu.sh b/tests/kvm-explicit-cpu/test.sh -similarity index 94% -rename from tests/test-kvm-explicit-cpu.sh -rename to tests/kvm-explicit-cpu/test.sh -index 7482b83..ba137c0 100755 ---- a/tests/test-kvm-explicit-cpu.sh -+++ b/tests/kvm-explicit-cpu/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/kvm-explicit-cpu -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="kvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/kvm/Makefile.am b/tests/kvm/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/kvm/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-kvm.sh b/tests/kvm/test.sh -similarity index 95% -rename from tests/test-kvm.sh -rename to tests/kvm/test.sh -index 035e244..8315213 100755 ---- a/tests/test-kvm.sh -+++ b/tests/kvm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/kvm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="kvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/ldoms/Makefile.am b/tests/ldoms/Makefile.am -new file mode 100644 -index 0000000..45770aa ---- /dev/null -+++ b/tests/ldoms/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ dev/mdesc \ -+ proc/cpuinfo \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-ldoms.sh b/tests/ldoms/test.sh -similarity index 94% -rename from tests/test-ldoms.sh -rename to tests/ldoms/test.sh -index 6ae5aba..d911f08 100755 ---- a/tests/test-ldoms.sh -+++ b/tests/ldoms/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/ldoms -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="ldoms - ldoms-guest" - -diff --git a/tests/linux-vserver/Makefile.am b/tests/linux-vserver/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/linux-vserver/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-linux-vserver.sh b/tests/linux-vserver/test.sh -similarity index 94% -rename from tests/test-linux-vserver.sh -rename to tests/linux-vserver/test.sh -index 7988f81..008e291 100755 ---- a/tests/test-linux-vserver.sh -+++ b/tests/linux-vserver/test.sh -@@ -16,9 +16,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/linux-vserver -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="linux_vserver - linux_vserver-guest" - -diff --git a/tests/lkvm-arm/Makefile.am b/tests/lkvm-arm/Makefile.am -new file mode 100644 -index 0000000..5014fd4 ---- /dev/null -+++ b/tests/lkvm-arm/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/device-tree/compatible \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-lkvm-arm.sh b/tests/lkvm-arm/test.sh -similarity index 94% -rename from tests/test-lkvm-arm.sh -rename to tests/lkvm-arm/test.sh -index bed50ad..251db04 100755 ---- a/tests/test-lkvm-arm.sh -+++ b/tests/lkvm-arm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/lkvm-arm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="lkvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/lkvm/Makefile.am b/tests/lkvm/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/lkvm/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-lkvm.sh b/tests/lkvm/test.sh -similarity index 94% -rename from tests/test-lkvm.sh -rename to tests/lkvm/test.sh -index 6eb326c..79850e0 100755 ---- a/tests/test-lkvm.sh -+++ b/tests/lkvm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/lkvm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="lkvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/lx86/Makefile.am b/tests/lx86/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/lx86/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-lx86.sh b/tests/lx86/test.sh -similarity index 95% -rename from tests/test-lx86.sh -rename to tests/lx86/test.sh -index 69d08a7..b3b1ccb 100755 ---- a/tests/test-lx86.sh -+++ b/tests/lx86/test.sh -@@ -16,9 +16,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/lx86 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="powervm_lx86" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/lxc/Makefile.am b/tests/lxc/Makefile.am -new file mode 100644 -index 0000000..59a2d70 ---- /dev/null -+++ b/tests/lxc/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/1/environ \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-lxc.sh b/tests/lxc/test.sh -similarity index 95% -rename from tests/test-lxc.sh -rename to tests/lxc/test.sh -index 47a5f2b..c619de9 100755 ---- a/tests/test-lxc.sh -+++ b/tests/lxc/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/lxc -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="lxc" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/parallels-desktop/Makefile.am b/tests/parallels-desktop/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/parallels-desktop/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-parallels-desktop.sh b/tests/parallels-desktop/test.sh -similarity index 94% -rename from tests/test-parallels-desktop.sh -rename to tests/parallels-desktop/test.sh -index 20701fe..5585fec 100755 ---- a/tests/test-parallels-desktop.sh -+++ b/tests/parallels-desktop/test.sh -@@ -16,9 +16,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/parallels-desktop -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="parallels" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/ppc64-baremetal/Makefile.am b/tests/ppc64-baremetal/Makefile.am -new file mode 100644 -index 0000000..0198c8f ---- /dev/null -+++ b/tests/ppc64-baremetal/Makefile.am -@@ -0,0 +1,27 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-ppc64-baremetal.sh b/tests/ppc64-baremetal/test.sh -similarity index 94% -rename from tests/test-ppc64-baremetal.sh -rename to tests/ppc64-baremetal/test.sh -index 9ca3cee..6687ce3 100755 ---- a/tests/test-ppc64-baremetal.sh -+++ b/tests/ppc64-baremetal/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/ppc64-baremetal -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/ppc64-kvm/Makefile.am b/tests/ppc64-kvm/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/ppc64-kvm/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-ppc64-kvm.sh b/tests/ppc64-kvm/test.sh -similarity index 94% -rename from tests/test-ppc64-kvm.sh -rename to tests/ppc64-kvm/test.sh -index c691c96..c0ece85 100755 ---- a/tests/test-ppc64-kvm.sh -+++ b/tests/ppc64-kvm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/ppc64-kvm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="ibm_power-kvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/ppc64-lpar-dedicated/Makefile.am b/tests/ppc64-lpar-dedicated/Makefile.am -new file mode 100644 -index 0000000..bfbe474 ---- /dev/null -+++ b/tests/ppc64-lpar-dedicated/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/ppc64/lparcfg \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-ppc64-lpar-dedicated.sh b/tests/ppc64-lpar-dedicated/test.sh -similarity index 94% -rename from tests/test-ppc64-lpar-dedicated.sh -rename to tests/ppc64-lpar-dedicated/test.sh -index 0316ea2..c51eafc 100755 ---- a/tests/test-ppc64-lpar-dedicated.sh -+++ b/tests/ppc64-lpar-dedicated/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/ppc64-lpar-dedicated -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="ibm_power-lpar_dedicated" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/ppc64-lpar-shared/Makefile.am b/tests/ppc64-lpar-shared/Makefile.am -new file mode 100644 -index 0000000..8f1f63f ---- /dev/null -+++ b/tests/ppc64-lpar-shared/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ proc/ppc64/lparcfg \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-ppc64-lpar-shared.sh b/tests/ppc64-lpar-shared/test.sh -similarity index 94% -rename from tests/test-ppc64-lpar-shared.sh -rename to tests/ppc64-lpar-shared/test.sh -index bbc974a..cfa564e 100755 ---- a/tests/test-ppc64-lpar-shared.sh -+++ b/tests/ppc64-lpar-shared/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/ppc64-lpar-shared -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="ibm_power-lpar_shared" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/qemu-arm/Makefile.am b/tests/qemu-arm/Makefile.am -new file mode 100644 -index 0000000..4d8b02d ---- /dev/null -+++ b/tests/qemu-arm/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/device-tree/fw-cfg@9020000/compatible \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-qemu-arm.sh b/tests/qemu-arm/test.sh -similarity index 94% -rename from tests/test-qemu-arm.sh -rename to tests/qemu-arm/test.sh -index 58455c8..a6d487e 100755 ---- a/tests/test-qemu-arm.sh -+++ b/tests/qemu-arm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/qemu-arm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="qemu" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/qemu-smbios-kvm/Makefile.am b/tests/qemu-smbios-kvm/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/qemu-smbios-kvm/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-qemu-smbios-kvm.sh b/tests/qemu-smbios-kvm/test.sh -similarity index 94% -rename from tests/test-qemu-smbios-kvm.sh -rename to tests/qemu-smbios-kvm/test.sh -index f4d8e38..04e291e 100755 ---- a/tests/test-qemu-smbios-kvm.sh -+++ b/tests/qemu-smbios-kvm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/qemu-smbios-kvm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="kvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/qemu-smbios/Makefile.am b/tests/qemu-smbios/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/qemu-smbios/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-qemu-smbios.sh b/tests/qemu-smbios/test.sh -similarity index 94% -rename from tests/test-qemu-smbios.sh -rename to tests/qemu-smbios/test.sh -index 114470a..a6d487e 100755 ---- a/tests/test-qemu-smbios.sh -+++ b/tests/qemu-smbios/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/qemu-smbios -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="qemu" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/qemu/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-qemu.sh b/tests/qemu/test.sh -similarity index 94% -rename from tests/test-qemu.sh -rename to tests/qemu/test.sh -index 284fe41..6691307 100755 ---- a/tests/test-qemu.sh -+++ b/tests/qemu/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/qemu -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="qemu" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/rhel5-xen-dom0/Makefile.am b/tests/rhel5-xen-dom0/Makefile.am -new file mode 100644 -index 0000000..12e9835 ---- /dev/null -+++ b/tests/rhel5-xen-dom0/Makefile.am -@@ -0,0 +1,48 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ proc/xen/balloon \ -+ proc/xen/capabilities \ -+ proc/xen/privcmd \ -+ proc/xen/xenbus \ -+ proc/xen/xsd_kva \ -+ proc/xen/xsd_port \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper \ -+ sys/hypervisor/properties/pagesize \ -+ sys/hypervisor/properties/changeset \ -+ sys/hypervisor/properties/virtual_start \ -+ sys/hypervisor/properties/capabilities \ -+ sys/hypervisor/properties/writable_pt \ -+ sys/hypervisor/type \ -+ sys/hypervisor/vmcoreinfo \ -+ sys/hypervisor/version/minor \ -+ sys/hypervisor/version/major \ -+ sys/hypervisor/version/extra \ -+ sys/hypervisor/compilation/compiler \ -+ sys/hypervisor/compilation/compiled_by \ -+ sys/hypervisor/compilation/compile_date \ -+ sys/hypervisor/uuid -diff --git a/tests/test-rhel5-xen-dom0.sh b/tests/rhel5-xen-dom0/test.sh -similarity index 94% -rename from tests/test-rhel5-xen-dom0.sh -rename to tests/rhel5-xen-dom0/test.sh -index 6571ecd..0d3297a 100755 ---- a/tests/test-rhel5-xen-dom0.sh -+++ b/tests/rhel5-xen-dom0/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/rhel5-xen-dom0 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="xen - xen-dom0" - -diff --git a/tests/rhel5-xen-domU-hvm-ia64/Makefile.am b/tests/rhel5-xen-domU-hvm-ia64/Makefile.am -new file mode 100644 -index 0000000..48d7662 ---- /dev/null -+++ b/tests/rhel5-xen-domU-hvm-ia64/Makefile.am -@@ -0,0 +1,33 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper \ -+ sys/bus/xen/drivers/vbd/bind \ -+ sys/bus/xen/drivers/vbd/unbind \ -+ sys/bus/xen/drivers/vif/bind \ -+ sys/bus/xen/drivers/vif/unbind \ -+ sys/bus/xen/drivers_probe -diff --git a/tests/test-rhel5-xen-domU-hvm-ia64.sh b/tests/rhel5-xen-domU-hvm-ia64/test.sh -similarity index 93% -rename from tests/test-rhel5-xen-domU-hvm-ia64.sh -rename to tests/rhel5-xen-domU-hvm-ia64/test.sh -index 5f29c1b..7f84a5c 100755 ---- a/tests/test-rhel5-xen-domU-hvm-ia64.sh -+++ b/tests/rhel5-xen-domU-hvm-ia64/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/rhel5-xen-domU-hvm-ia64 -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="xen - xen-hvm" - -diff --git a/tests/rhel5-xen-domU-hvm/Makefile.am b/tests/rhel5-xen-domU-hvm/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/rhel5-xen-domU-hvm/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-rhel5-xen-domU-hvm.sh b/tests/rhel5-xen-domU-hvm/test.sh -similarity index 94% -rename from tests/test-rhel5-xen-domU-hvm.sh -rename to tests/rhel5-xen-domU-hvm/test.sh -index 593fdb7..627de55 100755 ---- a/tests/test-rhel5-xen-domU-hvm.sh -+++ b/tests/rhel5-xen-domU-hvm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/rhel5-xen-domU-hvm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="xen - xen-hvm" - -diff --git a/tests/rhel5-xen-domU-pv/Makefile.am b/tests/rhel5-xen-domU-pv/Makefile.am -new file mode 100644 -index 0000000..4eeb69b ---- /dev/null -+++ b/tests/rhel5-xen-domU-pv/Makefile.am -@@ -0,0 +1,46 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ proc/xen/balloon \ -+ proc/xen/capabilities \ -+ proc/xen/privcmd \ -+ proc/xen/xenbus \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper \ -+ sys/hypervisor/properties/pagesize \ -+ sys/hypervisor/properties/changeset \ -+ sys/hypervisor/properties/virtual_start \ -+ sys/hypervisor/properties/capabilities \ -+ sys/hypervisor/properties/writable_pt \ -+ sys/hypervisor/type \ -+ sys/hypervisor/vmcoreinfo \ -+ sys/hypervisor/version/minor \ -+ sys/hypervisor/version/major \ -+ sys/hypervisor/version/extra \ -+ sys/hypervisor/compilation/compiler \ -+ sys/hypervisor/compilation/compiled_by \ -+ sys/hypervisor/compilation/compile_date \ -+ sys/hypervisor/uuid -diff --git a/tests/test-rhel5-xen-domU-pv.sh b/tests/rhel5-xen-domU-pv/test.sh -similarity index 94% -rename from tests/test-rhel5-xen-domU-pv.sh -rename to tests/rhel5-xen-domU-pv/test.sh -index 6561605..a3b9472 100755 ---- a/tests/test-rhel5-xen-domU-pv.sh -+++ b/tests/rhel5-xen-domU-pv/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/rhel5-xen-domU-pv -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="xen - xen-domU" - -diff --git a/tests/rhev/Makefile.am b/tests/rhev/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/rhev/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-rhev.sh b/tests/rhev/test.sh -similarity index 94% -rename from tests/test-rhev.sh -rename to tests/rhev/test.sh -index 76be547..7d9c22f 100755 ---- a/tests/test-rhev.sh -+++ b/tests/rhev/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/rhev -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="rhev - kvm" - -diff --git a/tests/vmm/Makefile.am b/tests/vmm/Makefile.am -new file mode 100644 -index 0000000..0198c8f ---- /dev/null -+++ b/tests/vmm/Makefile.am -@@ -0,0 +1,27 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-vmm.sh b/tests/vmm/test.sh -similarity index 95% -rename from tests/test-vmm.sh -rename to tests/vmm/test.sh -index e1de60a..56c3b0e 100755 ---- a/tests/test-vmm.sh -+++ b/tests/vmm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/vmm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="vmm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/xen-arm/Makefile.am b/tests/xen-arm/Makefile.am -new file mode 100644 -index 0000000..acf118a ---- /dev/null -+++ b/tests/xen-arm/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/device-tree/hypervisor/compatible \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-xen-arm.sh b/tests/xen-arm/test.sh -similarity index 94% -rename from tests/test-xen-arm.sh -rename to tests/xen-arm/test.sh -index 209712e..a4c2599 100755 ---- a/tests/test-xen-arm.sh -+++ b/tests/xen-arm/test.sh -@@ -15,9 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/xen-arm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="xen" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/zvm/Makefile.am b/tests/zvm/Makefile.am -new file mode 100644 -index 0000000..951274b ---- /dev/null -+++ b/tests/zvm/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ proc/sysinfo \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/test-zvm.sh b/tests/zvm/test.sh -similarity index 95% -rename from tests/test-zvm.sh -rename to tests/zvm/test.sh -index 0620db0..a22f311 100755 ---- a/tests/test-zvm.sh -+++ b/tests/zvm/test.sh -@@ -16,9 +16,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --root=tests/zvm -- --output="$(./virt-what --test-root=$root 2>&1)" -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="ibm_systemz - ibm_systemz-zvm" - --- -2.31.1 - diff --git a/SOURCES/0016-build-Add-.gitignore-to-tarball.patch b/SOURCES/0016-build-Add-.gitignore-to-tarball.patch deleted file mode 100644 index 371faa4..0000000 --- a/SOURCES/0016-build-Add-.gitignore-to-tarball.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5c2c251d9aae98e6a629b966bdd8cae2aa1dedaf Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 3 Oct 2019 10:16:08 +0100 -Subject: [PATCH 16/36] build: Add .gitignore to tarball. - -Mainly to keep maintainer-check-extra-dist happy. ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b62738f..1cb73b7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -19,7 +19,7 @@ AM_CPPFLAGS = -Wall - - CLEANFILES = virt-what *~ - --EXTRA_DIST = virt-what.in virt-what.pod -+EXTRA_DIST = .gitignore virt-what.in virt-what.pod - - SUBDIRS = . tests - --- -2.31.1 - diff --git a/SOURCES/0017-maintainer-Add-rules-for-maintainers.patch b/SOURCES/0017-maintainer-Add-rules-for-maintainers.patch deleted file mode 100644 index 91e6ca0..0000000 --- a/SOURCES/0017-maintainer-Add-rules-for-maintainers.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b6161b67b0bd542169e13cdfa0488a0266e3ae7a Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 3 Oct 2019 10:13:43 +0100 -Subject: [PATCH 17/36] maintainer: Add rules for maintainers. - -Adds: -make maintainer-check-extra-dist -make maintainer-commit -make maintainer-tag ---- - Makefile.am | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 1cb73b7..5435132 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -41,3 +41,30 @@ virt-what.txt: virt-what.pod - pod2text $? > $@ - - endif -+ -+#---------------------------------------------------------------------- -+# Maintainers only! -+ -+# Check no files are missing from EXTRA_DIST rules, and that all -+# generated files have been included in the tarball. (Note you must -+# have done 'make dist') -+maintainer-check-extra-dist: -+ @zcat $(PACKAGE_NAME)-$(VERSION).tar.gz | tar tf - | sort | \ -+ sed 's,^$(PACKAGE_NAME)-$(VERSION)/,,' > tarfiles -+ @git ls-files | \ -+ sort > gitfiles -+ @comm -13 tarfiles gitfiles > comm-out -+ @echo Checking for differences between EXTRA_DIST and git ... -+ @cat comm-out -+ @[ ! -s comm-out ] -+ @rm tarfiles gitfiles comm-out -+ @echo PASS: EXTRA_DIST tests -+ -+# Commit everything in the current directory and set the commit -+# message to the current version number. -+maintainer-commit: -+ git commit -a -m "Version $(VERSION)." -+ -+# Tag HEAD with the current version. -+maintainer-tag: -+ git tag -a v$(VERSION) -m "Version $(VERSION)." -f --- -2.31.1 - diff --git a/SOURCES/0018-Fix-virt-what-cpuid-helper.patch b/SOURCES/0018-Fix-virt-what-cpuid-helper.patch deleted file mode 100644 index f21a406..0000000 --- a/SOURCES/0018-Fix-virt-what-cpuid-helper.patch +++ /dev/null @@ -1,118 +0,0 @@ -From a5471559e7398418f1bb9c538a7bfc8f39e9ae98 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 4 Oct 2019 15:57:42 +0300 -Subject: [PATCH 18/36] Fix virt-what-cpuid-helper. - -The value returned in %eax is the max_entry (eg. 0x40000000 -if there are no further leafs). However it is not reliable. -In addition if there are multiple leafs we should probably -only print the highest one. - -Also use uint32_t instead of unsigned int. - -Thanks: Paolo Bonzini. ---- - virt-what-cpuid-helper.c | 67 ++++++++++++++++++++++++++++------------ - 1 file changed, 48 insertions(+), 19 deletions(-) - -diff --git a/virt-what-cpuid-helper.c b/virt-what-cpuid-helper.c -index 7812545..0cd4a6f 100644 ---- a/virt-what-cpuid-helper.c -+++ b/virt-what-cpuid-helper.c -@@ -1,5 +1,5 @@ - /* virt-what-cpuid-helper: Are we running inside KVM or Xen HVM? -- * Copyright (C) 2008 Red Hat Inc. -+ * Copyright (C) 2008-2019 Red Hat Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -21,14 +21,35 @@ - */ - - #include -+#include -+#include - #include - - #if defined(__i386__) || defined(__x86_64__) - --static unsigned int --cpuid (unsigned int eax, char *sig) -+/* Known x86 hypervisor signatures. Note that if you add a new test -+ * to virt-what.in you may need to update this list. The signature is -+ * always 12 bytes except in the case of KVM. -+ */ -+static int -+known_signature (char *sig) - { -- unsigned int *sig32 = (unsigned int *) sig; -+ return -+ strcmp (sig, "bhyve bhyve ") == 0 || -+ strcmp (sig, "KVMKVMKVM") == 0 || -+ strcmp (sig, "LKVMLKVMLKVM") == 0 || -+ strcmp (sig, "Microsoft Hv") == 0 || -+ strcmp (sig, "OpenBSDVMM58") == 0 || -+ strcmp (sig, "TCGTCGTCGTCG") == 0 || -+ strcmp (sig, "VMwareVMware") == 0 || -+ strcmp (sig, "XenVMMXenVMM") == 0 || -+ 0; -+} -+ -+static uint32_t -+cpuid (uint32_t eax, char *sig) -+{ -+ uint32_t *sig32 = (uint32_t *) sig; - - asm volatile ( - "xchgl %%ebx,%1; xor %%ebx,%%ebx; cpuid; xchgl %%ebx,%1" -@@ -43,24 +64,32 @@ static void - cpu_sig (void) - { - char sig[13]; -- unsigned int base = 0x40000000, leaf = base; -- unsigned int max_entries; -+ const uint32_t base = 0x40000000; -+ uint32_t leaf; - -- memset (sig, 0, sizeof sig); -- max_entries = cpuid (leaf, sig); -- puts (sig); -- -- /* Most hypervisors only have information in leaf 0x40000000, but -- * upstream Xen contains further leaf entries (in particular when -- * used with Viridian [HyperV] extensions). CPUID is supposed to -- * return the maximum leaf offset in %eax, so that's what we use, -- * but only if it looks sensible. -+ /* Most hypervisors only have information in leaf 0x40000000. -+ * -+ * Some hypervisors have "Viridian [HyperV] extensions", and those -+ * must appear in slot 0x40000000, but they will also have the true -+ * hypervisor in a higher slot. -+ * -+ * CPUID is supposed to return the maximum leaf offset in %eax, but -+ * this is not reliable. Instead we check the returned signatures -+ * against a known list (the others will be empty or garbage) and -+ * only print the ones we know about. This is OK because if we add -+ * a new test in virt-what we can update the list. -+ * -+ * By searching backwards we only print the highest entry, thus -+ * ignoring Viridian for Xen (and Nutanix). If we ever encounter a -+ * hypervisor that has more than 2 entries we may need to revisit -+ * this. - */ -- if (max_entries > 3 && max_entries < 0x10000) { -- for (leaf = base + 0x100; leaf <= base + max_entries; leaf += 0x100) { -- memset (sig, 0, sizeof sig); -- cpuid (leaf, sig); -+ for (leaf = base + 0xff00; leaf >= base; leaf -= 0x100) { -+ memset (sig, 0, sizeof sig); -+ cpuid (leaf, sig); -+ if (known_signature (sig)) { - puts (sig); -+ break; - } - } - } --- -2.31.1 - diff --git a/SOURCES/0019-Add-support-for-Nutanix-Acropolis-Hypervisor-AHV-RHB.patch b/SOURCES/0019-Add-support-for-Nutanix-Acropolis-Hypervisor-AHV-RHB.patch deleted file mode 100644 index d8c7525..0000000 --- a/SOURCES/0019-Add-support-for-Nutanix-Acropolis-Hypervisor-AHV-RHB.patch +++ /dev/null @@ -1,405 +0,0 @@ -From 01ea13d9813df93e294b0d9776d4cefd54b1609b Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 4 Oct 2019 16:25:55 +0300 -Subject: [PATCH 19/36] Add support for Nutanix Acropolis Hypervisor (AHV) - (RHBZ#1756381). - -Thanks: Cristian Seres for providing access to a guest. ---- - configure.ac | 2 + - tests/nutanix-ahv/Makefile.am | 28 ++++ - tests/nutanix-ahv/proc/cpuinfo | 27 ++++ - tests/nutanix-ahv/proc/self/status | 55 ++++++++ - tests/nutanix-ahv/sbin/dmidecode | 123 ++++++++++++++++++ - tests/nutanix-ahv/sbin/uname | 2 + - tests/nutanix-ahv/sbin/virt-what-cpuid-helper | 2 + - tests/nutanix-ahv/test.sh | 32 +++++ - virt-what.in | 10 +- - virt-what.pod | 6 + - 10 files changed, 286 insertions(+), 1 deletion(-) - create mode 100644 tests/nutanix-ahv/Makefile.am - create mode 100644 tests/nutanix-ahv/proc/cpuinfo - create mode 100644 tests/nutanix-ahv/proc/self/status - create mode 100755 tests/nutanix-ahv/sbin/dmidecode - create mode 100755 tests/nutanix-ahv/sbin/uname - create mode 100755 tests/nutanix-ahv/sbin/virt-what-cpuid-helper - create mode 100755 tests/nutanix-ahv/test.sh - -diff --git a/configure.ac b/configure.ac -index 5e0d9c4..f246e34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,7 @@ tests="\ - lkvm-arm \ - lx86 \ - lxc \ -+ nutanix-ahv \ - parallels-desktop \ - ppc64-baremetal \ - ppc64-kvm \ -@@ -93,6 +94,7 @@ AC_CONFIG_FILES([Makefile - tests/lkvm-arm/Makefile - tests/lx86/Makefile - tests/lxc/Makefile -+ tests/nutanix-ahv/Makefile - tests/parallels-desktop/Makefile - tests/ppc64-baremetal/Makefile - tests/ppc64-kvm/Makefile -diff --git a/tests/nutanix-ahv/Makefile.am b/tests/nutanix-ahv/Makefile.am -new file mode 100644 -index 0000000..b748df8 ---- /dev/null -+++ b/tests/nutanix-ahv/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/nutanix-ahv/proc/cpuinfo b/tests/nutanix-ahv/proc/cpuinfo -new file mode 100644 -index 0000000..d7a1f68 ---- /dev/null -+++ b/tests/nutanix-ahv/proc/cpuinfo -@@ -0,0 +1,27 @@ -+processor : 0 -+vendor_id : GenuineIntel -+cpu family : 15 -+model : 6 -+model name : Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz -+stepping : 1 -+microcode : 0x1 -+cpu MHz : 2199.998 -+cache size : 16384 KB -+physical id : 0 -+siblings : 1 -+core id : 0 -+cpu cores : 1 -+apicid : 0 -+initial apicid : 0 -+fpu : yes -+fpu_exception : yes -+cpuid level : 13 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss syscall nx pdpe1gb rdtscp lm constant_tsc nopl cpuid tsc_known_freq pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti ssbd ibrs ibpb stibp fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap clflushopt avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 arat md_clear -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs -+bogomips : 4399.99 -+clflush size : 64 -+cache_alignment : 128 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -diff --git a/tests/nutanix-ahv/proc/self/status b/tests/nutanix-ahv/proc/self/status -new file mode 100644 -index 0000000..7b4eed0 ---- /dev/null -+++ b/tests/nutanix-ahv/proc/self/status -@@ -0,0 +1,55 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 18508 -+Ngid: 0 -+Pid: 18508 -+PPid: 18506 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 64 -+Groups: 0 -+NStgid: 18508 -+NSpid: 18508 -+NSpgid: 18506 -+NSsid: 1945 -+VmPeak: 5392 kB -+VmSize: 5392 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 760 kB -+VmRSS: 760 kB -+RssAnon: 68 kB -+RssFile: 692 kB -+RssShmem: 0 kB -+VmData: 312 kB -+VmStk: 132 kB -+VmExe: 28 kB -+VmLib: 1456 kB -+VmPTE: 48 kB -+VmSwap: 0 kB -+HugetlbPages: 0 kB -+CoreDumping: 0 -+THP_enabled: 1 -+Threads: 1 -+SigQ: 3/7359 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000003fffffffff -+CapEff: 0000003fffffffff -+CapBnd: 0000003fffffffff -+CapAmb: 0000000000000000 -+NoNewPrivs: 0 -+Seccomp: 0 -+Speculation_Store_Bypass: thread vulnerable -+Cpus_allowed: ffff,ffffffff,ffffffff,ffffffff,ffffffff,ffffffff,ffffffff,ffffffff -+Cpus_allowed_list: 0-239 -+Mems_allowed: 00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 0 -+nonvoluntary_ctxt_switches: 2 -diff --git a/tests/nutanix-ahv/sbin/dmidecode b/tests/nutanix-ahv/sbin/dmidecode -new file mode 100755 -index 0000000..3774819 ---- /dev/null -+++ b/tests/nutanix-ahv/sbin/dmidecode -@@ -0,0 +1,123 @@ -+#!/bin/sh - -+cat <<'EOF' -+i# dmidecode 3.2 -+Getting SMBIOS data from sysfs. -+SMBIOS 2.8 present. -+9 structures occupying 486 bytes. -+Table at 0x000F73C0. -+ -+Handle 0x0000, DMI type 0, 24 bytes -+BIOS Information -+ Vendor: SeaBIOS -+ Version: 1.9.1-5.el6 -+ Release Date: 04/01/2014 -+ Address: 0xE8000 -+ Runtime Size: 96 kB -+ ROM Size: 64 kB -+ Characteristics: -+ BIOS characteristics not supported -+ Targeted content distribution is supported -+ BIOS Revision: 0.0 -+ -+Handle 0x0100, DMI type 1, 27 bytes -+System Information -+ Manufacturer: Nutanix -+ Product Name: AHV -+ Version: RHEL 7.3.0 PC (i440FX + PIIX, 1996) -+ Serial Number: B913C223-EEDE-4DFC-BB43-BE1495F4388D -+ UUID: b913c223-eede-4dfc-bb43-be1495f4388d -+ Wake-up Type: Power Switch -+ SKU Number: Not Specified -+ Family: Red Hat Enterprise Linux -+ -+Handle 0x0300, DMI type 3, 21 bytes -+Chassis Information -+ Manufacturer: Red Hat -+ Type: Other -+ Lock: Not Present -+ Version: RHEL 7.3.0 PC (i440FX + PIIX, 1996) -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Boot-up State: Safe -+ Power Supply State: Safe -+ Thermal State: Safe -+ Security Status: Unknown -+ OEM Information: 0x00000000 -+ Height: Unspecified -+ Number Of Power Cords: Unspecified -+ Contained Elements: 0 -+ -+Handle 0x0400, DMI type 4, 42 bytes -+Processor Information -+ Socket Designation: CPU 0 -+ Type: Central Processor -+ Family: Other -+ Manufacturer: Red Hat -+ ID: 61 0F 00 00 FF FB 8B 0F -+ Version: RHEL 7.3.0 PC (i440FX + PIIX, 1996) -+ Voltage: Unknown -+ External Clock: Unknown -+ Max Speed: 2000 MHz -+ Current Speed: 2000 MHz -+ Status: Populated, Enabled -+ Upgrade: Other -+ L1 Cache Handle: Not Provided -+ L2 Cache Handle: Not Provided -+ L3 Cache Handle: Not Provided -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Core Count: 1 -+ Core Enabled: 1 -+ Thread Count: 1 -+ Characteristics: None -+ -+Handle 0x1000, DMI type 16, 23 bytes -+Physical Memory Array -+ Location: Other -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 2 GB -+ Error Information Handle: Not Provided -+ Number Of Devices: 1 -+ -+Handle 0x1100, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x1000 -+ Error Information Handle: Not Provided -+ Total Width: Unknown -+ Data Width: Unknown -+ Size: 2048 MB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM 0 -+ Bank Locator: Not Specified -+ Type: RAM -+ Type Detail: Other -+ Speed: Unknown -+ Manufacturer: Red Hat -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Rank: Unknown -+ Configured Memory Speed: Unknown -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x1300, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x00000000000 -+ Ending Address: 0x0007FFFFFFF -+ Range Size: 2 GB -+ Physical Array Handle: 0x1000 -+ Partition Width: 1 -+ -+Handle 0x2000, DMI type 32, 11 bytes -+System Boot Information -+ Status: No errors detected -+ -+Handle 0x7F00, DMI type 127, 4 bytes -+End Of Table -+ -+EOF -diff --git a/tests/nutanix-ahv/sbin/uname b/tests/nutanix-ahv/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/nutanix-ahv/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/nutanix-ahv/sbin/virt-what-cpuid-helper b/tests/nutanix-ahv/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..f52a9d7 ---- /dev/null -+++ b/tests/nutanix-ahv/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo KVMKVMKVM -diff --git a/tests/nutanix-ahv/test.sh b/tests/nutanix-ahv/test.sh -new file mode 100755 -index 0000000..3d934b2 ---- /dev/null -+++ b/tests/nutanix-ahv/test.sh -@@ -0,0 +1,32 @@ -+# Test for Nutanix AHV -+# Copyright (C) 2019 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -+expected="nutanix_ahv" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi -diff --git a/virt-what.in b/virt-what.in -index f685461..9eafa05 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -1,6 +1,6 @@ - #!/bin/sh - - # @configure_input@ --# Copyright (C) 2008-2017 Red Hat Inc. -+# Copyright (C) 2008-2019 Red Hat Inc. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -220,6 +220,14 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then - skip_qemu_kvm=true - fi - -+# Check for Nutanix AHV. -+# This is sufficiently different from KVM and has Viridian extensions, -+# so skip the KVM test. -+if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then -+ echo nutanix_ahv -+ skip_qemu_kvm=true -+fi -+ - # Check for oVirt/RHEV. - if echo "$dmi" | grep -q 'Manufacturer: oVirt'; then - echo ovirt -diff --git a/virt-what.pod b/virt-what.pod -index 5a0bdfc..ea5cb77 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -177,6 +177,12 @@ is lkvm (a.k.a kvmtool). - - Status: contributed by Andrew Jones - -+=item B -+ -+The guest is running inside Nutanix Acropolis Hypervisor (AHV). -+ -+Status: confirmed by RWMJ. -+ - =item B - - The guest appears to be running inside an OpenVZ or Virtuozzo --- -2.31.1 - diff --git a/SOURCES/0020-helper-Fix-KVM-signature.patch b/SOURCES/0020-helper-Fix-KVM-signature.patch deleted file mode 100644 index fdeb5c4..0000000 --- a/SOURCES/0020-helper-Fix-KVM-signature.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0443f1fc78f2a79c073dbdf4133bec41c4c0591 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 4 Oct 2019 18:30:01 +0100 -Subject: [PATCH 20/36] helper: Fix KVM signature. - -Thanks: Paolo Bonzini. ---- - virt-what-cpuid-helper.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/virt-what-cpuid-helper.c b/virt-what-cpuid-helper.c -index 0cd4a6f..9c6cdb2 100644 ---- a/virt-what-cpuid-helper.c -+++ b/virt-what-cpuid-helper.c -@@ -28,15 +28,16 @@ - #if defined(__i386__) || defined(__x86_64__) - - /* Known x86 hypervisor signatures. Note that if you add a new test -- * to virt-what.in you may need to update this list. The signature is -- * always 12 bytes except in the case of KVM. -+ * to virt-what.in you may need to update this list. Note the -+ * signature is always 12 bytes long, plus we add \0 to the end to -+ * make it 13 bytes. - */ - static int --known_signature (char *sig) -+known_signature (const char *sig) - { - return - strcmp (sig, "bhyve bhyve ") == 0 || -- strcmp (sig, "KVMKVMKVM") == 0 || -+ memcmp (sig, "KVMKVMKVM\0\0\0", 12) == 0 || - strcmp (sig, "LKVMLKVMLKVM") == 0 || - strcmp (sig, "Microsoft Hv") == 0 || - strcmp (sig, "OpenBSDVMM58") == 0 || --- -2.31.1 - diff --git a/SOURCES/0021-Fix-incorrect-detection-of-MS-Surfacebook-2-as-a-vir.patch b/SOURCES/0021-Fix-incorrect-detection-of-MS-Surfacebook-2-as-a-vir.patch deleted file mode 100644 index 165d0fe..0000000 --- a/SOURCES/0021-Fix-incorrect-detection-of-MS-Surfacebook-2-as-a-vir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 71ef45e9543278e9920e449b71e0da269662ebc9 Mon Sep 17 00:00:00 2001 -From: willem van de velde -Date: Tue, 22 Oct 2019 11:58:01 +0100 -Subject: [PATCH 21/36] Fix incorrect detection of MS Surfacebook 2 as a - virtual machine. - ---- - virt-what.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/virt-what.in b/virt-what.in -index 9eafa05..a61ce91 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -132,7 +132,8 @@ fi - # The negative check for cpuid is to distinguish this from Hyper-V - # which also has the same manufacturer string in the SM-BIOS data. - if [ "$cpuid" != "Microsoft Hv" ] && -- echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then -+ echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation' && -+ echo "$dmi" | grep -q 'Product Name: Virtual Machine'; then - echo virtualpc - fi - --- -2.31.1 - diff --git a/SOURCES/0022-Add-support-for-VMware-ESXi-on-ARM.patch b/SOURCES/0022-Add-support-for-VMware-ESXi-on-ARM.patch deleted file mode 100644 index 73f6c97..0000000 --- a/SOURCES/0022-Add-support-for-VMware-ESXi-on-ARM.patch +++ /dev/null @@ -1,267 +0,0 @@ -From 8640dad5eb60eced313359e7ecea19b07d77242f Mon Sep 17 00:00:00 2001 -From: Razvan Corneliu -Date: Mon, 10 May 2021 21:02:27 +0100 -Subject: [PATCH 22/36] Add support for VMware ESXi on ARM - -Virt-what doesn't recognize VMware VMs for AARCH64/ARM (with licensing -implications in ESXi Fling for ARM and Fusion v.Next for ARM). I've -created and attached a patch that adds both support for recognizing -ESXi and the automated tests for it. ---- - configure.ac | 2 + - tests/esx-arm/Makefile.am | 30 ++++++++++ - tests/esx-arm/proc/cpuinfo | 18 ++++++ - .../proc/device-tree/hypervisor/compatible | 1 + - .../esx-arm/proc/device-tree/hypervisor/name | 1 + - tests/esx-arm/proc/self/status | 55 +++++++++++++++++++ - tests/esx-arm/sbin/dmidecode | 2 + - tests/esx-arm/sbin/uname | 2 + - tests/esx-arm/sbin/virt-what-cpuid-helper | 2 + - tests/esx-arm/test.sh | 32 +++++++++++ - virt-what.in | 4 ++ - 11 files changed, 149 insertions(+) - create mode 100644 tests/esx-arm/Makefile.am - create mode 100644 tests/esx-arm/proc/cpuinfo - create mode 100644 tests/esx-arm/proc/device-tree/hypervisor/compatible - create mode 100644 tests/esx-arm/proc/device-tree/hypervisor/name - create mode 100644 tests/esx-arm/proc/self/status - create mode 100755 tests/esx-arm/sbin/dmidecode - create mode 100755 tests/esx-arm/sbin/uname - create mode 100755 tests/esx-arm/sbin/virt-what-cpuid-helper - create mode 100755 tests/esx-arm/test.sh - -diff --git a/configure.ac b/configure.ac -index f246e34..f9b3096 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,6 +41,7 @@ tests="\ - baremetal \ - bhyve \ - docker \ -+ esx-arm \ - esx4.1 \ - hyperv \ - kvm \ -@@ -84,6 +85,7 @@ AC_CONFIG_FILES([Makefile - tests/baremetal/Makefile - tests/bhyve/Makefile - tests/docker/Makefile -+ tests/esx-arm/Makefile - tests/esx4.1/Makefile - tests/hyperv/Makefile - tests/kvm/Makefile -diff --git a/tests/esx-arm/Makefile.am b/tests/esx-arm/Makefile.am -new file mode 100644 -index 0000000..b87ec83 ---- /dev/null -+++ b/tests/esx-arm/Makefile.am -@@ -0,0 +1,30 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/device-tree/hypervisor/compatible \ -+ proc/device-tree/hypervisor/name \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/esx-arm/proc/cpuinfo b/tests/esx-arm/proc/cpuinfo -new file mode 100644 -index 0000000..246b574 ---- /dev/null -+++ b/tests/esx-arm/proc/cpuinfo -@@ -0,0 +1,18 @@ -+processor : 0 -+BogoMIPS : 108.00 -+Features : fp asimd evtstrm crc32 cpuid -+CPU implementer : 0x41 -+CPU architecture: 8 -+CPU variant : 0x0 -+CPU part : 0xd08 -+CPU revision : 3 -+ -+processor : 1 -+BogoMIPS : 108.00 -+Features : fp asimd evtstrm crc32 cpuid -+CPU implementer : 0x41 -+CPU architecture: 8 -+CPU variant : 0x0 -+CPU part : 0xd08 -+CPU revision : 3 -+ -diff --git a/tests/esx-arm/proc/device-tree/hypervisor/compatible b/tests/esx-arm/proc/device-tree/hypervisor/compatible -new file mode 100644 -index 0000000..0554874 ---- /dev/null -+++ b/tests/esx-arm/proc/device-tree/hypervisor/compatible -@@ -0,0 +1 @@ -+vmware -diff --git a/tests/esx-arm/proc/device-tree/hypervisor/name b/tests/esx-arm/proc/device-tree/hypervisor/name -new file mode 100644 -index 0000000..d508e44 ---- /dev/null -+++ b/tests/esx-arm/proc/device-tree/hypervisor/name -@@ -0,0 +1 @@ -+hypervisor -diff --git a/tests/esx-arm/proc/self/status b/tests/esx-arm/proc/self/status -new file mode 100644 -index 0000000..13dd246 ---- /dev/null -+++ b/tests/esx-arm/proc/self/status -@@ -0,0 +1,55 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 292937 -+Ngid: 0 -+Pid: 292937 -+PPid: 10956 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 256 -+Groups: 0 -+NStgid: 292937 -+NSpid: 292937 -+NSpgid: 292937 -+NSsid: 10956 -+VmPeak: 6400 kB -+VmSize: 6400 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 960 kB -+VmRSS: 960 kB -+RssAnon: 448 kB -+RssFile: 512 kB -+RssShmem: 0 kB -+VmData: 640 kB -+VmStk: 192 kB -+VmExe: 64 kB -+VmLib: 1600 kB -+VmPTE: 384 kB -+VmSwap: 0 kB -+HugetlbPages: 0 kB -+CoreDumping: 0 -+THP_enabled: 1 -+Threads: 1 -+SigQ: 2/3947 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000003fffffffff -+CapEff: 0000003fffffffff -+CapBnd: 0000003fffffffff -+CapAmb: 0000000000000000 -+NoNewPrivs: 0 -+Seccomp: 0 -+Speculation_Store_Bypass: vulnerable -+Cpus_allowed: 3 -+Cpus_allowed_list: 0-1 -+Mems_allowed: 01 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 1 -+nonvoluntary_ctxt_switches: 0 -diff --git a/tests/esx-arm/sbin/dmidecode b/tests/esx-arm/sbin/dmidecode -new file mode 100755 -index 0000000..e53c12f ---- /dev/null -+++ b/tests/esx-arm/sbin/dmidecode -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+exit 1 -diff --git a/tests/esx-arm/sbin/uname b/tests/esx-arm/sbin/uname -new file mode 100755 -index 0000000..bd33a2d ---- /dev/null -+++ b/tests/esx-arm/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo aarch64 -diff --git a/tests/esx-arm/sbin/virt-what-cpuid-helper b/tests/esx-arm/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..77a6692 ---- /dev/null -+++ b/tests/esx-arm/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+# nothing -diff --git a/tests/esx-arm/test.sh b/tests/esx-arm/test.sh -new file mode 100755 -index 0000000..344afef ---- /dev/null -+++ b/tests/esx-arm/test.sh -@@ -0,0 +1,32 @@ -+# Test for ESXi on ARM -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -+expected="vmware" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi -diff --git a/virt-what.in b/virt-what.in -index a61ce91..59743c3 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -264,6 +264,10 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then - echo xen - skip_qemu_kvm=true - skip_lkvm=true -+ elif [ -d "${root}/proc/device-tree/hypervisor" ] && -+ grep -q "vmware" "${root}/proc/device-tree/hypervisor/compatible"; then -+ echo vmware -+ skip_lkvm=true - fi - elif [ "$arch" = "ia64" ]; then - if [ -d "${root}/sys/bus/xen" -a ! -d "${root}/sys/bus/xen-backend" ]; then --- -2.31.1 - diff --git a/SOURCES/0023-docker-Check-for-.dockerenv-too.patch b/SOURCES/0023-docker-Check-for-.dockerenv-too.patch deleted file mode 100644 index 01e5472..0000000 --- a/SOURCES/0023-docker-Check-for-.dockerenv-too.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a24df0c780aaf74f0ed408bc55386b9f933fb7aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 1 Dec 2019 07:58:04 +0200 -Subject: [PATCH 23/36] docker: Check for /.dockerenv too - -/.dockerinit may no longer exist. - -Ref https://github.com/moby/moby/issues/18355 - -(cherry picked from commit e2c49cda221f95cb65b1b3ac3ae15aa41d92f519) ---- - tests/docker/.dockerenv | 0 - tests/docker/Makefile.am | 1 + - virt-what.in | 2 +- - 3 files changed, 2 insertions(+), 1 deletion(-) - create mode 100644 tests/docker/.dockerenv - -diff --git a/tests/docker/.dockerenv b/tests/docker/.dockerenv -new file mode 100644 -index 0000000..e69de29 -diff --git a/tests/docker/Makefile.am b/tests/docker/Makefile.am -index e0ea991..e2a95d8 100644 ---- a/tests/docker/Makefile.am -+++ b/tests/docker/Makefile.am -@@ -21,6 +21,7 @@ TESTS = test.sh - - EXTRA_DIST = \ - test.sh \ -+ .dockerenv \ - .dockerinit \ - proc/cpuinfo \ - proc/self/status \ -diff --git a/virt-what.in b/virt-what.in -index 59743c3..900a05d 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -349,7 +349,7 @@ if ! "$skip_lkvm"; then - fi - - # Check for Docker. --if [ -f "${root}/.dockerinit" ]; then -+if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ]; then - echo docker - fi - --- -2.31.1 - diff --git a/SOURCES/0024-docker-Lookup-from-proc-self-cgroup-too.patch b/SOURCES/0024-docker-Lookup-from-proc-self-cgroup-too.patch deleted file mode 100644 index f5adad1..0000000 --- a/SOURCES/0024-docker-Lookup-from-proc-self-cgroup-too.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6831ccb71a7b19c6e5cb970026cbffff39928e2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 1 Dec 2019 08:21:32 +0200 -Subject: [PATCH 24/36] docker: Lookup from /proc/self/cgroup too - -Refs https://github.com/moby/moby/issues/18355 - -(cherry picked from commit 57f0c3cc6a7e631f644d67f05b002c6004bb6601) ---- - tests/docker/Makefile.am | 1 + - tests/docker/proc/self/cgroup | 13 +++++++++++++ - virt-what.in | 3 ++- - 3 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 tests/docker/proc/self/cgroup - -diff --git a/tests/docker/Makefile.am b/tests/docker/Makefile.am -index e2a95d8..401f372 100644 ---- a/tests/docker/Makefile.am -+++ b/tests/docker/Makefile.am -@@ -24,6 +24,7 @@ EXTRA_DIST = \ - .dockerenv \ - .dockerinit \ - proc/cpuinfo \ -+ proc/self/cgroup \ - proc/self/status \ - sbin/dmidecode \ - sbin/uname \ -diff --git a/tests/docker/proc/self/cgroup b/tests/docker/proc/self/cgroup -new file mode 100644 -index 0000000..5547637 ---- /dev/null -+++ b/tests/docker/proc/self/cgroup -@@ -0,0 +1,13 @@ -+12:devices:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+11:blkio:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+10:perf_event:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+9:pids:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+8:cpuset:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+7:rdma:/ -+6:hugetlb:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+5:net_cls,net_prio:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+4:memory:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+3:freezer:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+2:cpu,cpuacct:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+1:name=systemd:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae -+0::/system.slice/containerd.service -diff --git a/virt-what.in b/virt-what.in -index 900a05d..6330fd0 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -349,7 +349,8 @@ if ! "$skip_lkvm"; then - fi - - # Check for Docker. --if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ]; then -+if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \ -+ grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then - echo docker - fi - --- -2.31.1 - diff --git a/SOURCES/0025-Simplify-and-fix-invocation-of-cpuid.patch b/SOURCES/0025-Simplify-and-fix-invocation-of-cpuid.patch deleted file mode 100644 index be6510c..0000000 --- a/SOURCES/0025-Simplify-and-fix-invocation-of-cpuid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 88eb2b7fbd7e6af1cd1860c3f2023ee7b9125d37 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 13 Apr 2021 09:35:07 +0100 -Subject: [PATCH 25/36] Simplify and fix invocation of cpuid. - -Fixes a crash on some platforms identified by Yongkui Guo in -https://bugzilla.redhat.com/show_bug.cgi?id=1756381#c15 - -(cherry picked from commit 60d903fbb7653bc9754228bdab4c6933fcda1e72) ---- - virt-what-cpuid-helper.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/virt-what-cpuid-helper.c b/virt-what-cpuid-helper.c -index 9c6cdb2..fdceb62 100644 ---- a/virt-what-cpuid-helper.c -+++ b/virt-what-cpuid-helper.c -@@ -47,17 +47,25 @@ known_signature (const char *sig) - 0; - } - -+/* Copied from the Linux kernel definition in -+ * arch/x86/include/asm/processor.h -+ */ -+static inline void -+cpuid (uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) -+{ -+ asm volatile ("cpuid" -+ : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) -+ : "0" (*eax), "2" (*ecx) -+ : "memory"); -+} -+ - static uint32_t --cpuid (uint32_t eax, char *sig) -+cpuid_leaf (uint32_t eax, char *sig) - { - uint32_t *sig32 = (uint32_t *) sig; - -- asm volatile ( -- "xchgl %%ebx,%1; xor %%ebx,%%ebx; cpuid; xchgl %%ebx,%1" -- : "=a" (eax), "+r" (sig32[0]), "=c" (sig32[1]), "=d" (sig32[2]) -- : "0" (eax)); -- sig[12] = 0; -- -+ cpuid (&eax, &sig32[0], &sig32[1], &sig32[2]); -+ sig[12] = 0; /* \0-terminate the string to make string comparison possible */ - return eax; - } - -@@ -87,7 +95,7 @@ cpu_sig (void) - */ - for (leaf = base + 0xff00; leaf >= base; leaf -= 0x100) { - memset (sig, 0, sizeof sig); -- cpuid (leaf, sig); -+ cpuid_leaf (leaf, sig); - if (known_signature (sig)) { - puts (sig); - break; --- -2.31.1 - diff --git a/SOURCES/0026-Add-podman-support.patch b/SOURCES/0026-Add-podman-support.patch deleted file mode 100644 index 1e54d90..0000000 --- a/SOURCES/0026-Add-podman-support.patch +++ /dev/null @@ -1,233 +0,0 @@ -From 3277b38cc88e577c7da7838a6366efbf3d22c538 Mon Sep 17 00:00:00 2001 -From: Jordan Webb -Date: Mon, 13 Apr 2020 21:41:30 +0000 -Subject: [PATCH 26/36] Add podman support - -(cherry picked from commit 1df728aa4b1d2814265f9c86494f7d55ee0cf9af) ---- - configure.ac | 2 ++ - tests/podman/1/environ | Bin 0 -> 155 bytes - tests/podman/Makefile.am | 29 ++++++++++++++++++++ - tests/podman/proc/cpuinfo | 0 - tests/podman/proc/self/cgroup | 10 +++++++ - tests/podman/proc/self/status | 0 - tests/podman/sbin/dmidecode | 6 +++++ - tests/podman/sbin/uname | 2 ++ - tests/podman/sbin/virt-what-cpuid-helper | 2 ++ - tests/podman/test.sh | 32 +++++++++++++++++++++++ - virt-what.in | 10 ++++++- - virt-what.pod | 6 +++++ - 12 files changed, 98 insertions(+), 1 deletion(-) - create mode 100644 tests/podman/1/environ - create mode 100644 tests/podman/Makefile.am - create mode 100644 tests/podman/proc/cpuinfo - create mode 100644 tests/podman/proc/self/cgroup - create mode 100644 tests/podman/proc/self/status - create mode 100755 tests/podman/sbin/dmidecode - create mode 100755 tests/podman/sbin/uname - create mode 100755 tests/podman/sbin/virt-what-cpuid-helper - create mode 100755 tests/podman/test.sh - -diff --git a/configure.ac b/configure.ac -index f9b3096..5fd716b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,7 @@ tests="\ - lxc \ - nutanix-ahv \ - parallels-desktop \ -+ podman \ - ppc64-baremetal \ - ppc64-kvm \ - ppc64-lpar-dedicated \ -@@ -98,6 +99,7 @@ AC_CONFIG_FILES([Makefile - tests/lxc/Makefile - tests/nutanix-ahv/Makefile - tests/parallels-desktop/Makefile -+ tests/podman/Makefile - tests/ppc64-baremetal/Makefile - tests/ppc64-kvm/Makefile - tests/ppc64-lpar-dedicated/Makefile -diff --git a/tests/podman/1/environ b/tests/podman/1/environ -new file mode 100644 -index 0000000000000000000000000000000000000000..dd6f0d4d67a151ab7bab97565b0737b8dbf7db44 -GIT binary patch -literal 155 -zcmYL>K?=hl5JhL*%XorW3^JI2CJ>u-F>Rni)ncUd_?@JS?B@UX=Ygfcpaw_1MfC|) -zr4V1LmeOGMJmGP5qhtJ+`+g?F^0V`SgdCeIPY%CrtqJUC&fa%yMZLtVmasj+>YHQl -YMd8IEi3Dr7m)t_kYsGhYq>$nA11>u+CjbBd - -literal 0 -HcmV?d00001 - -diff --git a/tests/podman/Makefile.am b/tests/podman/Makefile.am -new file mode 100644 -index 0000000..a4c70ad ---- /dev/null -+++ b/tests/podman/Makefile.am -@@ -0,0 +1,29 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/cgroup \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/podman/proc/cpuinfo b/tests/podman/proc/cpuinfo -new file mode 100644 -index 0000000..e69de29 -diff --git a/tests/podman/proc/self/cgroup b/tests/podman/proc/self/cgroup -new file mode 100644 -index 0000000..11fc74e ---- /dev/null -+++ b/tests/podman/proc/self/cgroup -@@ -0,0 +1,10 @@ -+11:perf_event:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+10:devices:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+8:pids:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+7:blkio:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+6:cpu,cpuacct:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+5:net_cls,net_prio:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+4:freezer:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+3:cpuset:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+2:memory:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -+1:name=systemd:/machine.slice/libpod-2ed85a65b4d6aedbf4e6bd1bb2d29e6d7778791bd02532788eb16954cebf01da.scope -diff --git a/tests/podman/proc/self/status b/tests/podman/proc/self/status -new file mode 100644 -index 0000000..e69de29 -diff --git a/tests/podman/sbin/dmidecode b/tests/podman/sbin/dmidecode -new file mode 100755 -index 0000000..d9992ad ---- /dev/null -+++ b/tests/podman/sbin/dmidecode -@@ -0,0 +1,6 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 2.11 -+/dev/mem: Operation not permitted -+EOF -+exit 1 -diff --git a/tests/podman/sbin/uname b/tests/podman/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/podman/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/podman/sbin/virt-what-cpuid-helper b/tests/podman/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..ad82504 ---- /dev/null -+++ b/tests/podman/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo @ -diff --git a/tests/podman/test.sh b/tests/podman/test.sh -new file mode 100755 -index 0000000..6db58e5 ---- /dev/null -+++ b/tests/podman/test.sh -@@ -0,0 +1,32 @@ -+# Test for Podman -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -+expected="podman" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi -diff --git a/virt-what.in b/virt-what.in -index 6330fd0..b7d266b 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -165,7 +165,7 @@ fi - # Added by Marc Fournier - - if [ -e "${root}/proc/1/environ" ] && -- cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container='; then -+ cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=lxc'; then - echo lxc - fi - -@@ -354,6 +354,14 @@ if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \ - echo docker - fi - -+# Check for Podman. -+if [ -e "${root}/proc/1/environ" ] && -+ cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=podman'; then -+ echo podman -+elif grep -qF /libpod- "${root}/proc/self/cgroup" 2>/dev/null; then -+ echo podman -+fi -+ - # Check ppc64 lpar, kvm or powerkvm - - # example /proc/cpuinfo line indicating 'not baremetal' -diff --git a/virt-what.pod b/virt-what.pod -index ea5cb77..405537b 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -204,6 +204,12 @@ The guest is running inside Parallels Virtual Platform - - Status: contributed by Justin Clift - -+=item B -+ -+This is a Podman container. -+ -+Status: contributed by Jordan Webb -+ - =item B - - The guest is running inside IBM PowerVM Lx86 Linux/x86 emulator. --- -2.31.1 - diff --git a/SOURCES/0027-aws-Match-multi-digit-version-number-in-BIOS-informa.patch b/SOURCES/0027-aws-Match-multi-digit-version-number-in-BIOS-informa.patch deleted file mode 100644 index ec9743d..0000000 --- a/SOURCES/0027-aws-Match-multi-digit-version-number-in-BIOS-informa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e0ba7102f7a2e926773e16dc0ea8bf959862c4b7 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 26 May 2021 11:31:24 +0100 -Subject: [PATCH 27/36] aws: Match multi-digit version number in BIOS - information - -See: https://listman.redhat.com/archives/virt-tools-list/2021-May/msg00011.html -Reported-by: Stuart Cooper -(cherry picked from commit b1eae421ff3fdbac0f9ec5b300259c16ff7b1d93) ---- - virt-what.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virt-what.in b/virt-what.in -index b7d266b..8021290 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -413,7 +413,7 @@ fi - - # Check for AWS. - # AWS on Xen. --if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then -+if echo "$dmi" | grep -Eq 'Version: [0-9]+\.[0-9]+\.amazon'; then - echo aws - # AWS on baremetal or KVM. - elif echo "$dmi" | grep -q 'Vendor: Amazon EC2'; then --- -2.31.1 - diff --git a/SOURCES/0028-Add-support-for-Alibaba-Cloud-Linux.patch b/SOURCES/0028-Add-support-for-Alibaba-Cloud-Linux.patch deleted file mode 100644 index f8bc519..0000000 --- a/SOURCES/0028-Add-support-for-Alibaba-Cloud-Linux.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4da6d385eb5a2b262d3304304c3eba803dd8cc1a Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Thu, 27 May 2021 10:53:08 +0100 -Subject: [PATCH 28/36] Add support for Alibaba Cloud Linux - -(cherry picked from commit ed11e2d298ec7466fac656a38a2cefd386130420) ---- - virt-what.in | 5 +++++ - virt-what.pod | 6 ++++++ - 2 files changed, 11 insertions(+) - -diff --git a/virt-what.in b/virt-what.in -index 8021290..3dac91a 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -113,6 +113,11 @@ dmi=$(LANG=C dmidecode 2>&1) - - arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') - -+# Check for Alibaba Cloud -+if echo "$dmi" | grep -q 'Manufacturer: Alibaba Cloud'; then -+ echo "alibaba_cloud" -+fi -+ - # Check for VMware. - # cpuid check added by Chetan Loke. - -diff --git a/virt-what.pod b/virt-what.pod -index 405537b..9f8bea2 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -25,6 +25,12 @@ don't know about or cannot detect. - - =over 4 - -+=item B -+ -+This is a cloud computing service based on Alibaba Cloud. -+ -+Status: contributed by Weisson. -+ - =item B - - Amazon Web Services. --- -2.31.1 - diff --git a/SOURCES/0029-Add-test-for-Alibaba-Cloud-Linux.patch b/SOURCES/0029-Add-test-for-Alibaba-Cloud-Linux.patch deleted file mode 100644 index e6a19d6..0000000 --- a/SOURCES/0029-Add-test-for-Alibaba-Cloud-Linux.patch +++ /dev/null @@ -1,392 +0,0 @@ -From 6655488e00f9c5da802c739c46e3a0ee070b503c Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Thu, 27 May 2021 10:55:57 +0100 -Subject: [PATCH 29/36] Add test for Alibaba Cloud Linux - -(cherry picked from commit 7e679278431aa1a188dfe423526dfea82fddcbd3) ---- - configure.ac | 2 + - tests/alibaba-cloud-x86/Makefile.am | 27 ++++ - tests/alibaba-cloud-x86/proc/cpuinfo | 53 +++++++ - tests/alibaba-cloud-x86/proc/self/status | 54 ++++++++ - tests/alibaba-cloud-x86/sbin/dmidecode | 131 ++++++++++++++++++ - tests/alibaba-cloud-x86/sbin/uname | 2 + - .../sbin/virt-what-cpuid-helper | 2 + - tests/alibaba-cloud-x86/test.sh | 33 +++++ - 8 files changed, 304 insertions(+) - create mode 100644 tests/alibaba-cloud-x86/Makefile.am - create mode 100644 tests/alibaba-cloud-x86/proc/cpuinfo - create mode 100644 tests/alibaba-cloud-x86/proc/self/status - create mode 100755 tests/alibaba-cloud-x86/sbin/dmidecode - create mode 100755 tests/alibaba-cloud-x86/sbin/uname - create mode 100755 tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper - create mode 100755 tests/alibaba-cloud-x86/test.sh - -diff --git a/configure.ac b/configure.ac -index 5fd716b..40a57b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -34,6 +34,7 @@ AM_CONDITIONAL([HOST_CPU_IA64], [ test "x$host_cpu" = "xia64" ]) - - dnl List of tests. - tests="\ -+ alibaba-cloud-x86 \ - aws-baremetal-x86 \ - aws-kvm-arm \ - aws-kvm-x86 \ -@@ -79,6 +80,7 @@ AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_FILES([virt-what],[chmod +x virt-what]) - AC_CONFIG_FILES([Makefile - tests/Makefile -+ tests/alibaba-cloud-x86/Makefile - tests/aws-baremetal-x86/Makefile - tests/aws-kvm-arm/Makefile - tests/aws-kvm-x86/Makefile -diff --git a/tests/alibaba-cloud-x86/Makefile.am b/tests/alibaba-cloud-x86/Makefile.am -new file mode 100644 -index 0000000..c9ea7a1 ---- /dev/null -+++ b/tests/alibaba-cloud-x86/Makefile.am -@@ -0,0 +1,27 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2011 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+CLEANFILES = *~ -+ -+TESTS = test.sh -+ -+EXTRA_DIST = \ -+ test.sh \ -+ proc/cpuinfo \ -+ proc/self/status \ -+ sbin/dmidecode \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/alibaba-cloud-x86/proc/cpuinfo b/tests/alibaba-cloud-x86/proc/cpuinfo -new file mode 100644 -index 0000000..99fa1af ---- /dev/null -+++ b/tests/alibaba-cloud-x86/proc/cpuinfo -@@ -0,0 +1,53 @@ -+processor : 0 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 85 -+model name : Intel(R) Xeon(R) Platinum 8269CY CPU @ 2.50GHz -+stepping : 7 -+microcode : 0x1 -+cpu MHz : 2500.002 -+cache size : 36608 KB -+physical id : 0 -+siblings : 2 -+core id : 0 -+cpu cores : 1 -+apicid : 0 -+initial apicid : 0 -+fpu : yes -+fpu_exception : yes -+cpuid level : 22 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid tsc_known_freq pni pclmulqdq monitor ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves arat avx512_vnni -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit -+bogomips : 5000.00 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -+ -+processor : 1 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 85 -+model name : Intel(R) Xeon(R) Platinum 8269CY CPU @ 2.50GHz -+stepping : 7 -+microcode : 0x1 -+cpu MHz : 2500.002 -+cache size : 36608 KB -+physical id : 0 -+siblings : 2 -+core id : 0 -+cpu cores : 1 -+apicid : 1 -+initial apicid : 1 -+fpu : yes -+fpu_exception : yes -+cpuid level : 22 -+wp : yes -+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid tsc_known_freq pni pclmulqdq monitor ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves arat avx512_vnni -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit -+bogomips : 5000.00 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 46 bits physical, 48 bits virtual -+power management: -\ No newline at end of file -diff --git a/tests/alibaba-cloud-x86/proc/self/status b/tests/alibaba-cloud-x86/proc/self/status -new file mode 100644 -index 0000000..1ea7195 ---- /dev/null -+++ b/tests/alibaba-cloud-x86/proc/self/status -@@ -0,0 +1,54 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 25933 -+Ngid: 0 -+Pid: 25933 -+PPid: 25932 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 64 -+Groups: 0 -+NStgid: 25933 -+NSpid: 25933 -+NSpgid: 25932 -+NSsid: 25039 -+VmPeak: 108084 kB -+VmSize: 108084 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 748 kB -+VmRSS: 748 kB -+RssAnon: 76 kB -+RssFile: 672 kB -+RssShmem: 0 kB -+VmData: 188 kB -+VmStk: 132 kB -+VmExe: 44 kB -+VmLib: 1952 kB -+VmPTE: 68 kB -+VmSwap: 0 kB -+HugetlbPages: 0 kB -+CoreDumping: 0 -+Threads: 1 -+SigQ: 0/30350 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000003fffffffff -+CapEff: 0000003fffffffff -+CapBnd: 0000003fffffffff -+CapAmb: 0000000000000000 -+NoNewPrivs: 0 -+Seccomp: 0 -+Speculation_Store_Bypass: vulnerable -+Cpus_allowed: 3 -+Cpus_allowed_list: 0-1 -+Mems_allowed: 00000000,00000001 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 0 -+nonvoluntary_ctxt_switches: 2 -diff --git a/tests/alibaba-cloud-x86/sbin/dmidecode b/tests/alibaba-cloud-x86/sbin/dmidecode -new file mode 100755 -index 0000000..2ed2ef3 ---- /dev/null -+++ b/tests/alibaba-cloud-x86/sbin/dmidecode -@@ -0,0 +1,131 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.2 -+Getting SMBIOS data from sysfs. -+SMBIOS 2.8 present. -+10 structures occupying 462 bytes. -+Table at 0x000F5840. -+ -+Handle 0x0000, DMI type 0, 24 bytes -+BIOS Information -+ Vendor: SeaBIOS -+ Version: 8c24b4c -+ Release Date: 04/01/2014 -+ Address: 0xE8000 -+ Runtime Size: 96 kB -+ ROM Size: 64 kB -+ Characteristics: -+ BIOS characteristics not supported -+ Targeted content distribution is supported -+ BIOS Revision: 0.0 -+ -+Handle 0x0100, DMI type 1, 27 bytes -+System Information -+ Manufacturer: Alibaba Cloud -+ Product Name: Alibaba Cloud ECS -+ Version: pc-i440fx-2.1 -+ Serial Number: 20fb1c97-feb0-4c45-b8b9-bb06feeba0b5 -+ UUID: 20fb1c97-feb0-4c45-b8b9-bb06feeba0b5 -+ Wake-up Type: Power Switch -+ SKU Number: Not Specified -+ Family: Not Specified -+ -+Handle 0x0300, DMI type 3, 21 bytes -+Chassis Information -+ Manufacturer: Alibaba Cloud -+ Type: Other -+ Lock: Not Present -+ Version: pc-i440fx-2.1 -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Boot-up State: Safe -+ Power Supply State: Safe -+ Thermal State: Safe -+ Security Status: Unknown -+ OEM Information: 0x00000000 -+ Height: Unspecified -+ Number Of Power Cords: Unspecified -+ Contained Elements: 0 -+ -+Handle 0x0400, DMI type 4, 42 bytes -+Processor Information -+ Socket Designation: CPU 0 -+ Type: Central Processor -+ Family: Other -+ Manufacturer: Alibaba Cloud -+ ID: 57 06 05 00 FF FB 8B 0F -+ Version: pc-i440fx-2.1 -+ Voltage: Unknown -+ External Clock: Unknown -+ Max Speed: Unknown -+ Current Speed: Unknown -+ Status: Populated, Enabled -+ Upgrade: Other -+ L1 Cache Handle: Not Provided -+ L2 Cache Handle: Not Provided -+ L3 Cache Handle: Not Provided -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Core Count: 1 -+ Core Enabled: 1 -+ Thread Count: 2 -+ Characteristics: None -+ -+Handle 0x1000, DMI type 16, 23 bytes -+Physical Memory Array -+ Location: Other -+ Use: System Memory -+ Error Correction Type: Multi-bit ECC -+ Maximum Capacity: 8 GB -+ Error Information Handle: Not Provided -+ Number Of Devices: 1 -+ -+Handle 0x1100, DMI type 17, 40 bytes -+Memory Device -+ Array Handle: 0x1000 -+ Error Information Handle: Not Provided -+ Total Width: Unknown -+ Data Width: Unknown -+ Size: 8192 MB -+ Form Factor: DIMM -+ Set: None -+ Locator: DIMM 0 -+ Bank Locator: Not Specified -+ Type: RAM -+ Type Detail: Other -+ Speed: Unknown -+ Manufacturer: Alibaba Cloud -+ Serial Number: Not Specified -+ Asset Tag: Not Specified -+ Part Number: Not Specified -+ Rank: Unknown -+ Configured Memory Speed: Unknown -+ Minimum Voltage: Unknown -+ Maximum Voltage: Unknown -+ Configured Voltage: Unknown -+ -+Handle 0x1300, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x00000000000 -+ Ending Address: 0x000BFFFFFFF -+ Range Size: 3 GB -+ Physical Array Handle: 0x1000 -+ Partition Width: 1 -+ -+Handle 0x1301, DMI type 19, 31 bytes -+Memory Array Mapped Address -+ Starting Address: 0x00100000000 -+ Ending Address: 0x0023FFFFFFF -+ Range Size: 5 GB -+ Physical Array Handle: 0x1000 -+ Partition Width: 1 -+ -+Handle 0x2000, DMI type 32, 11 bytes -+System Boot Information -+ Status: No errors detected -+ -+Handle 0x7F00, DMI type 127, 4 bytes -+End Of Table -+ -+EOF -diff --git a/tests/alibaba-cloud-x86/sbin/uname b/tests/alibaba-cloud-x86/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/alibaba-cloud-x86/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper b/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..f52a9d7 ---- /dev/null -+++ b/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo KVMKVMKVM -diff --git a/tests/alibaba-cloud-x86/test.sh b/tests/alibaba-cloud-x86/test.sh -new file mode 100755 -index 0000000..afa2f44 ---- /dev/null -+++ b/tests/alibaba-cloud-x86/test.sh -@@ -0,0 +1,33 @@ -+# Test for Alibaba Cloud -+# Copyright (C) 2018 Red Hat Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -+expected="alibaba_cloud -+kvm" -+ -+if [ "$output" != "$expected" ]; then -+ echo "$0: test failed because output did not match expected" -+ echo "Expected output was:" -+ echo "----------------------------------------" -+ echo "$expected" -+ echo "----------------------------------------" -+ echo "But the actual output of the program was:" -+ echo "----------------------------------------" -+ echo "$output" -+ echo "----------------------------------------" -+ exit 1 -+fi --- -2.31.1 - diff --git a/SOURCES/0030-Check-for-Alibaba-Cloud-X-Dragon-Architecture.patch b/SOURCES/0030-Check-for-Alibaba-Cloud-X-Dragon-Architecture.patch deleted file mode 100644 index 8a0e0e7..0000000 --- a/SOURCES/0030-Check-for-Alibaba-Cloud-X-Dragon-Architecture.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 579addba79dccf0cfc84ee80ffb1f8c678be46ee Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Tue, 1 Jun 2021 20:49:17 +0800 -Subject: [PATCH 30/36] Check for Alibaba Cloud X-Dragon Architecture - -Thanks to Richard W.M. Jones' Super Powerful Bash Script - -(cherry picked from commit b7cc3d93a613ef6d0ac5ccd6e32cc3d66e057243) ---- - virt-what.in | 9 +++++++-- - virt-what.pod | 2 ++ - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/virt-what.in b/virt-what.in -index 3dac91a..520f7b0 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -114,8 +114,13 @@ dmi=$(LANG=C dmidecode 2>&1) - arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') - - # Check for Alibaba Cloud --if echo "$dmi" | grep -q 'Manufacturer: Alibaba Cloud'; then -- echo "alibaba_cloud" -+if echo "$dmi" | grep -q 'Manufacturer: Alibaba'; then -+ # Check for Alibaba Cloud X-Dragon Architecture -+ if ( { echo -e "GET /latest/meta-datainstance/instance-type HTTP/1.0\r\nHost: 100.100.100.200\r\n\r" >&3; grep -sq 'ebm' <&3 ; } 3<> /dev/tcp/100.100.100.200/80 ) 2>/dev/null ; then -+ echo "alibaba_cloud-x_dragon" -+ else -+ echo "alibaba_cloud" -+ fi - fi - - # Check for VMware. -diff --git a/virt-what.pod b/virt-what.pod -index 9f8bea2..6e29570 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -27,6 +27,8 @@ don't know about or cannot detect. - - =item B - -+=item B -+ - This is a cloud computing service based on Alibaba Cloud. - - Status: contributed by Weisson. --- -2.31.1 - diff --git a/SOURCES/0031-use-official-product-name-for-alibaba-cloud-bare-met.patch b/SOURCES/0031-use-official-product-name-for-alibaba-cloud-bare-met.patch deleted file mode 100644 index 24f0929..0000000 --- a/SOURCES/0031-use-official-product-name-for-alibaba-cloud-bare-met.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 68ac4a8bb0cb63b5df4a25451e66f7d6d96b2a9d Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Fri, 2 Jul 2021 17:06:07 +0800 -Subject: [PATCH 31/36] use official product name for alibaba cloud bare-metal - instances - -(cherry picked from commit c1980aebe6597950c34fc9e94d54e8fd0177cc27) ---- - virt-what.in | 4 ++-- - virt-what.pod | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/virt-what.in b/virt-what.in -index 520f7b0..3573221 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -115,9 +115,9 @@ arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') - - # Check for Alibaba Cloud - if echo "$dmi" | grep -q 'Manufacturer: Alibaba'; then -- # Check for Alibaba Cloud X-Dragon Architecture -+ # Check for Alibaba Cloud ECS Bare Metal (EBM) Instance - if ( { echo -e "GET /latest/meta-datainstance/instance-type HTTP/1.0\r\nHost: 100.100.100.200\r\n\r" >&3; grep -sq 'ebm' <&3 ; } 3<> /dev/tcp/100.100.100.200/80 ) 2>/dev/null ; then -- echo "alibaba_cloud-x_dragon" -+ echo "alibaba_cloud-ebm" - else - echo "alibaba_cloud" - fi -diff --git a/virt-what.pod b/virt-what.pod -index 6e29570..381385b 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -27,7 +27,7 @@ don't know about or cannot detect. - - =item B - --=item B -+=item B - - This is a cloud computing service based on Alibaba Cloud. - --- -2.31.1 - diff --git a/SOURCES/0032-Add-Google-Cloud-not-tested.patch b/SOURCES/0032-Add-Google-Cloud-not-tested.patch deleted file mode 100644 index 7948a30..0000000 --- a/SOURCES/0032-Add-Google-Cloud-not-tested.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3bd5bffe607be834708b4c265fd3982e6acd168b Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 19 Jul 2021 15:14:32 +0100 -Subject: [PATCH 32/36] Add Google Cloud (not tested) - -Thanks: Paolo Bonzini -(cherry picked from commit 8363fa9f0e2cbd970f34ffb7c7b23ed0ac2c374a) ---- - virt-what.in | 5 +++++ - virt-what.pod | 6 ++++++ - 2 files changed, 11 insertions(+) - -diff --git a/virt-what.in b/virt-what.in -index 3573221..aacbb13 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -247,6 +247,11 @@ if echo "$dmi" | grep -q 'Product Name: RHEV Hypervisor'; then - echo rhev - fi - -+# Google Cloud -+if echo "$dmi" | grep -q 'Product Name: Google Compute Engine'; then -+ echo google_cloud -+fi -+ - # Check for Xen. - - if [ "$cpuid" = "XenVMMXenVMM" ] && -diff --git a/virt-what.pod b/virt-what.pod -index 381385b..5ca63fe 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -55,6 +55,12 @@ This is a Docker container. - - Status: confirmed by Charles Nguyen - -+=item B -+ -+This is running on Google Cloud Platform / Google Compute Engine. -+ -+Status: not confirmed -+ - =item B - - This is Microsoft Hyper-V hypervisor. --- -2.31.1 - diff --git a/SOURCES/0033-Add-detection-of-Red-Hat-s-hypervisor.patch b/SOURCES/0033-Add-detection-of-Red-Hat-s-hypervisor.patch deleted file mode 100644 index 811de90..0000000 --- a/SOURCES/0033-Add-detection-of-Red-Hat-s-hypervisor.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 71d90582eaa852f7a663e8a77cfe90574760357e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 19 Jul 2021 18:05:14 +0100 -Subject: [PATCH 33/36] Add detection of Red Hat's hypervisor - -Red Hat sets the following fields in SMBIOS information, allowing us -to detect that it's the branded Red Hat hypervisor. - - Manufacturer: Red Hat - Product Name: KVM - Version: RHEL 7.6.0 PC (i440FX + PIIX, 1996) - -Note that "RHEL 7.6.0" there is the machine type, which is not the -same as the hypervisor version (although the two have a relationship). - -Thanks: Timothy Smith at IBM, Karen Noel -(cherry picked from commit b64df398779db07d008781c96685878795bcfd67) ---- - tests/nutanix-ahv/test.sh | 3 ++- - tests/rhel5-xen-domU-hvm/test.sh | 3 ++- - tests/rhev/test.sh | 1 + - virt-what.in | 5 +++++ - virt-what.pod | 6 ++++++ - 5 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/tests/nutanix-ahv/test.sh b/tests/nutanix-ahv/test.sh -index 3d934b2..a998dc0 100755 ---- a/tests/nutanix-ahv/test.sh -+++ b/tests/nutanix-ahv/test.sh -@@ -16,7 +16,8 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" --expected="nutanix_ahv" -+expected="nutanix_ahv -+redhat" - - if [ "$output" != "$expected" ]; then - echo "$0: test failed because output did not match expected" -diff --git a/tests/rhel5-xen-domU-hvm/test.sh b/tests/rhel5-xen-domU-hvm/test.sh -index 627de55..b88ef5c 100755 ---- a/tests/rhel5-xen-domU-hvm/test.sh -+++ b/tests/rhel5-xen-domU-hvm/test.sh -@@ -16,7 +16,8 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" --expected="xen -+expected="redhat -+xen - xen-hvm" - - if [ "$output" != "$expected" ]; then -diff --git a/tests/rhev/test.sh b/tests/rhev/test.sh -index 7d9c22f..9ba9315 100755 ---- a/tests/rhev/test.sh -+++ b/tests/rhev/test.sh -@@ -17,6 +17,7 @@ - - output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="rhev -+redhat - kvm" - - if [ "$output" != "$expected" ]; then -diff --git a/virt-what.in b/virt-what.in -index aacbb13..850760e 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -252,6 +252,11 @@ if echo "$dmi" | grep -q 'Product Name: Google Compute Engine'; then - echo google_cloud - fi - -+# Red Hat's hypervisor. -+if echo "$dmi" | grep -q 'Manufacturer: Red Hat'; then -+ echo redhat -+fi -+ - # Check for Xen. - - if [ "$cpuid" = "XenVMMXenVMM" ] && -diff --git a/virt-what.pod b/virt-what.pod -index 5ca63fe..2bce5c8 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -246,6 +246,12 @@ The guest is running on a Red Hat Enterprise Virtualization (RHEV) node. - - Status: confirmed by RWMJ - -+=item B -+ -+The guest is running on the Red Hat hypervisor. -+ -+Status: confirmed by RWMJ -+ - =item B - - This is a User-Mode Linux (UML) guest. --- -2.31.1 - diff --git a/SOURCES/0034-Display-kvm-qemu-fact-for-Nutanix-AHV.patch b/SOURCES/0034-Display-kvm-qemu-fact-for-Nutanix-AHV.patch deleted file mode 100644 index b3ddd10..0000000 --- a/SOURCES/0034-Display-kvm-qemu-fact-for-Nutanix-AHV.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3d0a9d20c97f9f6d9be5229a94409b57ef429e35 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 22 Jul 2021 08:58:16 +0100 -Subject: [PATCH 34/36] Display kvm/qemu fact for Nutanix AHV - -Since these are based on KVM we should display those facts too. - -Thanks: Paolo Bonzini -(cherry picked from commit c7f55d08c9ab2aaf56ebd0d179491f4e15b5097c) ---- - tests/nutanix-ahv/test.sh | 3 ++- - virt-what.in | 3 --- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/tests/nutanix-ahv/test.sh b/tests/nutanix-ahv/test.sh -index a998dc0..d5d6af2 100755 ---- a/tests/nutanix-ahv/test.sh -+++ b/tests/nutanix-ahv/test.sh -@@ -17,7 +17,8 @@ - - output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" - expected="nutanix_ahv --redhat" -+redhat -+kvm" - - if [ "$output" != "$expected" ]; then - echo "$0: test failed because output did not match expected" -diff --git a/virt-what.in b/virt-what.in -index 850760e..d56c84f 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -232,11 +232,8 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then - fi - - # Check for Nutanix AHV. --# This is sufficiently different from KVM and has Viridian extensions, --# so skip the KVM test. - if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then - echo nutanix_ahv -- skip_qemu_kvm=true - fi - - # Check for oVirt/RHEV. --- -2.31.1 - diff --git a/SOURCES/0035-Add-test-file-to-EXTRA_DIST.patch b/SOURCES/0035-Add-test-file-to-EXTRA_DIST.patch deleted file mode 100644 index b95ae07..0000000 --- a/SOURCES/0035-Add-test-file-to-EXTRA_DIST.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9257d0980ae08d7acd8ebdaeae0270f480b7b1af Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 14 Apr 2022 13:50:46 +0100 -Subject: [PATCH 35/36] Add test file to EXTRA_DIST - -Fixes: commit 7e679278431aa1a188dfe423526dfea82fddcbd3 -(cherry picked from commit 5c6076110ec42c0f54a0a926f3bc9351520a6780) ---- - tests/alibaba-cloud-x86/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/alibaba-cloud-x86/Makefile.am b/tests/alibaba-cloud-x86/Makefile.am -index c9ea7a1..b748df8 100644 ---- a/tests/alibaba-cloud-x86/Makefile.am -+++ b/tests/alibaba-cloud-x86/Makefile.am -@@ -24,4 +24,5 @@ EXTRA_DIST = \ - proc/cpuinfo \ - proc/self/status \ - sbin/dmidecode \ -+ sbin/uname \ - sbin/virt-what-cpuid-helper --- -2.31.1 - diff --git a/SOURCES/0036-Add-test-file-to-EXTRA_DIST.patch b/SOURCES/0036-Add-test-file-to-EXTRA_DIST.patch deleted file mode 100644 index 73e4ae6..0000000 --- a/SOURCES/0036-Add-test-file-to-EXTRA_DIST.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ffabec1019dff4c8034d2200e2d74b58db5cbd6 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 14 Apr 2022 13:51:13 +0100 -Subject: [PATCH 36/36] Add test file to EXTRA_DIST - -Fixes: commit 1df728aa4b1d2814265f9c86494f7d55ee0cf9af -(cherry picked from commit a6757ae742616d493764780faae00f786b854ffb) ---- - tests/podman/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/podman/Makefile.am b/tests/podman/Makefile.am -index a4c70ad..2962f32 100644 ---- a/tests/podman/Makefile.am -+++ b/tests/podman/Makefile.am -@@ -20,6 +20,7 @@ CLEANFILES = *~ - TESTS = test.sh - - EXTRA_DIST = \ -+ 1/environ \ - test.sh \ - proc/cpuinfo \ - proc/self/cgroup \ --- -2.31.1 - diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh new file mode 100755 index 0000000..f9f4479 --- /dev/null +++ b/SOURCES/copy-patches.sh @@ -0,0 +1,61 @@ +#!/bin/bash - + +set -e + +# Maintainer script to copy patches from the git repo to the current +# directory. It's normally only used downstream (ie. in RHEL). Use +# it like this: +# ./copy-patches.sh + +project=virt-what +rhel_version=8.7 + +# Check we're in the right directory. +if [ ! -f $project.spec ]; then + echo "$0: run this from the directory containing '$project.spec'" + exit 1 +fi + +case `id -un` in + rjones) git_checkout=$HOME/d/$project-rhel-$rhel_version ;; + lacos) git_checkout=$HOME/src/v2v/$project ;; + *) git_checkout=$HOME/d/$project-rhel-$rhel_version ;; +esac +if [ ! -d $git_checkout ]; then + echo "$0: $git_checkout does not exist" + echo "This script is only for use by the maintainer when preparing a" + echo "$project release on RHEL." + exit 1 +fi + +# Get the base version of the project. +version=`grep '^Version:' $project.spec | awk '{print $2}'` +tag="v$version" + +# Remove any existing patches. +git rm -f [0-9]*.patch ||: +rm -f [0-9]*.patch + +# Get the patches. +(cd $git_checkout; rm -f [0-9]*.patch; git -c core.abbrev=9 format-patch -O/dev/null -N --submodule=diff $tag) +mv $git_checkout/[0-9]*.patch . + +# Remove any not to be applied. +rm -f *NOT-FOR-RPM*.patch + +# Add the patches. +git add [0-9]*.patch + +# Print out the patch lines. +echo +echo "--- Copy the following text into $project.spec file" +echo + +echo "# Patches." +for f in [0-9]*.patch; do + n=`echo $f | awk -F- '{print $1}'` + echo "Patch$n: $f" +done + +echo +echo "--- End of text" diff --git a/SOURCES/gitignore b/SOURCES/gitignore deleted file mode 100644 index f565f34..0000000 --- a/SOURCES/gitignore +++ /dev/null @@ -1,28 +0,0 @@ -*~ -*.log -*.trs -*.o - -/virt-what-*.tar.gz -/.deps -/Makefile -/Makefile.in -/aclocal.m4 -/autom4te.cache -/compile -/config.guess -/config.h -/config.h.in -/config.log -/config.status -/config.sub -/configure -/depcomp -/install-sh -/missing -/stamp-h1 -/test-driver -/virt-what -/virt-what-cpuid-helper -/virt-what.1 -/virt-what.txt diff --git a/SPECS/virt-what.spec b/SPECS/virt-what.spec index c017f28..7ec0c70 100644 --- a/SPECS/virt-what.spec +++ b/SPECS/virt-what.spec @@ -1,72 +1,28 @@ Name: virt-what -Version: 1.18 -Release: 14%{?dist} +Version: 1.25 +Release: 1%{?dist} Summary: Detect if we are running in a virtual machine License: GPLv2+ URL: http://people.redhat.com/~rjones/virt-what/ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz -# Some of the patches below apply to .gitignore, but that file was not -# included in the tarball before v1.20. This is the version from -# v1.18 upstream allowing patching to go ahead. -Source1: gitignore +# Maintainer script which helps with handling patches. +Source1: copy-patches.sh -# Patches from upstream since 1.18 was released. -# NB: These patches are also stored in this upstream branch: +# Patches are maintained in the following repository: # http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-8.7 -Patch0001: 0001-Missing-have_cpuinfo-check.patch -Patch0002: 0002-Remove-bashisms.patch -Patch0003: 0003-As-xen-pv-guest-can-access-cpuid-from-Intel-CPUs-sta.patch -Patch0004: 0004-Recognize-ppc64le-little-endian-virtualization-RHBZ-.patch -Patch0005: 0005-Determine-architecture-via-uname-m.patch -Patch0006: 0006-Allow-using-sysctl-for-example-when-proc-isn-t-avail.patch -Patch0007: 0007-Replace-with-since-the-former-is-a-bash-ism.patch -# AWS support: -Patch0008: 0008-aws-Detect-AWS-from-dmidecode-information.patch -Patch0009: 0009-tests-Fix-tests-when-run-on-AWS.patch -Patch0010: 0010-aws-Add-regression-test-for-AWS-on-KVM-on-x86_64-arc.patch -Patch0011: 0011-aws-Add-regression-test-for-AWS-on-baremetal-on-x86_.patch -Patch0012: 0012-aws-Add-regression-test-for-AWS-on-Xen-on-x86_64-arc.patch -Patch0013: 0013-aws-Add-regression-test-for-AWS-on-KVM-on-ARM-archit.patch -# Refactor build and tests. -Patch0014: 0014-build-Remove-files-on-make-clean.patch -Patch0015: 0015-Arrange-tests-in-subdirectories.patch -Patch0016: 0016-build-Add-.gitignore-to-tarball.patch -Patch0017: 0017-maintainer-Add-rules-for-maintainers.patch -# Support for Nutanix AHV (RHBZ#1756381). -Patch0018: 0018-Fix-virt-what-cpuid-helper.patch -Patch0019: 0019-Add-support-for-Nutanix-Acropolis-Hypervisor-AHV-RHB.patch -Patch0020: 0020-helper-Fix-KVM-signature.patch -# Support for virtualized MS Surfacebook 2. -Patch0021: 0021-Fix-incorrect-detection-of-MS-Surfacebook-2-as-a-vir.patch -# Support for VMware on aarch64 (RHBZ#1959154). -Patch0022: 0022-Add-support-for-VMware-ESXi-on-ARM.patch -# Support for Docker (RHBZ#2000834). -Patch0023: 0023-docker-Check-for-.dockerenv-too.patch -Patch0024: 0024-docker-Lookup-from-proc-self-cgroup-too.patch -# Fix crash on non-KVM platforms through incorrect use of CPUID in -# patch 0018 (https://bugzilla.redhat.com/show_bug.cgi?id=1756381#c15). -Patch0025: 0025-Simplify-and-fix-invocation-of-cpuid.patch -# Further patches up to 1.22. -Patch0026: 0026-Add-podman-support.patch -Patch0027: 0027-aws-Match-multi-digit-version-number-in-BIOS-informa.patch -Patch0028: 0028-Add-support-for-Alibaba-Cloud-Linux.patch -Patch0029: 0029-Add-test-for-Alibaba-Cloud-Linux.patch -Patch0030: 0030-Check-for-Alibaba-Cloud-X-Dragon-Architecture.patch -Patch0031: 0031-use-official-product-name-for-alibaba-cloud-bare-met.patch -Patch0032: 0032-Add-Google-Cloud-not-tested.patch -Patch0033: 0033-Add-detection-of-Red-Hat-s-hypervisor.patch -Patch0034: 0034-Display-kvm-qemu-fact-for-Nutanix-AHV.patch -Patch0035: 0035-Add-test-file-to-EXTRA_DIST.patch -Patch0036: 0036-Add-test-file-to-EXTRA_DIST.patch - -# Patches touch Makefile.am: -BuildRequires: autoconf, automake + +# Patches. +#(no patches) + +BuildRequires: make BuildRequires: git +BuildRequires: autoconf, automake, libtool # This is provided by the build root, but we make it explicit # anyway in case this was dropped from the build root in future. +BuildRequires: gcc BuildRequires: /usr/bin/pod2man # Required at build time in order to do 'make check' (for getopt). @@ -97,70 +53,63 @@ know about or can't detect. Current types of virtualization detected: - - aws Amazon Web Services - - bhyve FreeBSD hypervisor - - docker Docker container - - hyperv Microsoft Hyper-V - - ibm_power-kvm - IBM POWER KVM - - ibm_power-lpar_shared + - alibaba_cloud Alibaba cloud + - alibaba_cloud-ebm + - aws Amazon Web Services + - bhyve FreeBSD hypervisor + - docker Docker container + - google_cloud Google cloud + - hyperv Microsoft Hyper-V + - ibm_power-kvm IBM POWER KVM + - ibm_power-lpar_shared IBM POWER LPAR (hardware partition) - ibm_power-lpar_dedicated - IBM POWER LPAR (hardware partition) - - ibm_systemz-* - IBM SystemZ Direct / LPAR / z/VM / KVM - - ldoms Oracle VM Server for SPARC Logical Domains - - linux_vserver - Linux VServer container - - lxc Linux LXC container - - kvm Linux Kernel Virtual Machine (KVM) - - lkvm LKVM / kvmtool - - openvz OpenVZ or Virtuozzo - - ovirt oVirt node - - parallels Parallels Virtual Platform - - powervm_lx86 IBM PowerVM Lx86 Linux/x86 emulator - - qemu QEMU (unaccelerated) - - rhev Red Hat Enterprise Virtualization - - uml User-Mode Linux (UML) - - virtage Hitachi Virtualization Manager (HVM) Virtage LPAR - - virtualbox VirtualBox - - virtualpc Microsoft VirtualPC - - vmm vmm OpenBSD hypervisor - - vmware VMware - - xen Xen - - xen-dom0 Xen dom0 (privileged domain) - - xen-domU Xen domU (paravirtualized guest domain) - - xen-hvm Xen guest fully virtualized (HVM) + - ibm_systemz-* IBM SystemZ Direct / LPAR / z/VM / KVM + - illumos-lx Illumos with Linux syscall emulation + - ldoms Oracle VM Server for SPARC Logical Domains + - linux_vserver Linux VServer container + - lxc Linux LXC container + - kvm Linux Kernel Virtual Machine (KVM) + - lkvm LKVM / kvmtool + - nutanix_ahv Nutanix Acropolis Hypervisor (AHV) + - openvz OpenVZ or Virtuozzo + - ovirt oVirt node + - parallels Parallels Virtual Platform + - podman Podman container + - powervm_lx86 IBM PowerVM Lx86 Linux/x86 emulator + - qemu QEMU (unaccelerated) + - redhat Red Hat hypervisor + - rhev Red Hat Enterprise Virtualization + - uml User-Mode Linux (UML) + - virtage Hitachi Virtualization Manager (HVM) Virtage LPAR + - virtualbox VirtualBox + - virtualpc Microsoft VirtualPC + - vmm vmm OpenBSD hypervisor + - vmware VMware + - xen Xen + - xen-dom0 Xen dom0 (privileged domain) + - xen-domU Xen domU (paravirtualized guest domain) + - xen-hvm Xen guest fully virtualized (HVM) %prep -# We can go back to autosetup once we rebase to >= v1.20 which -# includes the .gitignore file in the tarball. -#autosetup -S git -# But until then ... -%setup -q -n %{name}-%{version} -cp %{SOURCE1} .gitignore -git init -git config user.email "noone@example.com" -git config user.name "no one" -git add . -git commit -a -q -m "%{version} baseline" -git am %{patches} - 1.25-1 +- Rebase to 1.25 + resolves: rhbz#2118195 + * Tue Apr 19 2022 Richard W.M. Jones - 1.18-14 - Add guest detection for RHEL hypervisors resolves: rhbz#2076628