diff --git a/SOURCES/0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch b/SOURCES/0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch
new file mode 100644
index 0000000..4446201
--- /dev/null
+++ b/SOURCES/0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch
@@ -0,0 +1,27 @@
+From a29d4a5632ff9f60f939e4f0f36ce97ed43c5650 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 22 Dec 2022 10:31:47 +0000
+Subject: [PATCH] Rearrange lxc test to avoid use of cat
+
+Thanks: Elias Probst <e.probst@ssc-services.de>
+---
+ virt-what.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/virt-what.in b/virt-what.in
+index d090898e5..170bc24ab 100644
+--- a/virt-what.in
++++ b/virt-what.in
+@@ -175,7 +175,8 @@ fi
+ # Added by Marc Fournier
+
+ if [ -e "${root}/proc/1/environ" ] &&
+- cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=lxc'; then
++ tr '\000' '\n' < "${root}/proc/1/environ" |
++ grep -Eiq '^container=lxc'; then
+ echo lxc
+ fi
+
+--
+2.31.1
+
diff --git a/SOURCES/0002-Move-docker-and-podman-tests-up-add-comments.patch b/SOURCES/0002-Move-docker-and-podman-tests-up-add-comments.patch
new file mode 100644
index 0000000..10b115c
--- /dev/null
+++ b/SOURCES/0002-Move-docker-and-podman-tests-up-add-comments.patch
@@ -0,0 +1,83 @@
+From 57966df6adddbebc4f4a6b9db7680d99344b0b1c Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 22 Dec 2022 10:34:03 +0000
+Subject: [PATCH] Move docker and podman tests up, add comments
+
+Refactor to bring related tests closer together and make the comments
+more uniform.
+---
+ virt-what.in | 31 +++++++++++++++----------------
+ 1 file changed, 15 insertions(+), 16 deletions(-)
+
+diff --git a/virt-what.in b/virt-what.in
+index 170bc24ab..c6e4a1e00 100644
+--- a/virt-what.in
++++ b/virt-what.in
+@@ -165,7 +165,6 @@ fi
+ # /proc/vz - always exists if OpenVZ kernel is running (inside and outside
+ # container)
+ # /proc/bc - exists on node, but not inside container.
+-
+ if [ -d "${root}/proc/vz" -a ! -d "${root}/proc/bc" ]; then
+ echo openvz
+ fi
+@@ -173,13 +172,13 @@ fi
+ # Check for LXC containers
+ # http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface
+ # Added by Marc Fournier
+-
+ if [ -e "${root}/proc/1/environ" ] &&
+ tr '\000' '\n' < "${root}/proc/1/environ" |
+ grep -Eiq '^container=lxc'; then
+ echo lxc
+ fi
+
++# Check for Illumos LX
+ if [ -e "${root}/proc/1/environ" ] &&
+ tr '\0' '\n' < "${root}/proc/1/environ" | grep -q '^container=zone$' &&
+ [ -e "${root}/proc/version" ] &&
+@@ -187,6 +186,20 @@ if [ -e "${root}/proc/1/environ" ] &&
+ echo illumos-lx
+ fi
+
++# Check for Docker.
++if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
++ grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
++ 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 for Linux-VServer
+ if test -e "${root}/proc/self/status" \
+ && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
+@@ -381,20 +394,6 @@ if ! "$skip_lkvm"; then
+ fi
+ fi
+
+-# Check for Docker.
+-if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
+- grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
+- 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'
+--
+2.31.1
+
diff --git a/SOURCES/0003-podman-Fix-location-of-test-file-proc-1-environ.patch b/SOURCES/0003-podman-Fix-location-of-test-file-proc-1-environ.patch
new file mode 100644
index 0000000..2ddd094
--- /dev/null
+++ b/SOURCES/0003-podman-Fix-location-of-test-file-proc-1-environ.patch
@@ -0,0 +1,36 @@
+From 1cbcbb801c86f8f791ecd930c4ac311f034e3e1a Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 5 Jan 2023 12:48:55 +0000
+Subject: [PATCH] podman: Fix location of test file /proc/1/environ
+
+Since it was at the wrong location, the file was not even used by the
+test.
+
+Fixes: commit 1df728aa4b ("Add podman support")
+---
+ tests/podman/Makefile.am | 2 +-
+ tests/podman/{ => proc}/1/environ | Bin
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename tests/podman/{ => proc}/1/environ (100%)
+
+diff --git a/tests/podman/Makefile.am b/tests/podman/Makefile.am
+index 2962f3237..1745ef6c6 100644
+--- a/tests/podman/Makefile.am
++++ b/tests/podman/Makefile.am
+@@ -20,8 +20,8 @@ CLEANFILES = *~
+ TESTS = test.sh
+
+ EXTRA_DIST = \
+- 1/environ \
+ test.sh \
++ proc/1/environ \
+ proc/cpuinfo \
+ proc/self/cgroup \
+ proc/self/status \
+diff --git a/tests/podman/1/environ b/tests/podman/proc/1/environ
+similarity index 100%
+rename from tests/podman/1/environ
+rename to tests/podman/proc/1/environ
+--
+2.31.1
+
diff --git a/SOURCES/0004-Detect-OCI-containers.patch b/SOURCES/0004-Detect-OCI-containers.patch
new file mode 100644
index 0000000..f8e9a57
--- /dev/null
+++ b/SOURCES/0004-Detect-OCI-containers.patch
@@ -0,0 +1,888 @@
+From 54c2ad4a764658ec8a9aadc52c749eabf1de73a0 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 5 Jan 2023 12:34:02 +0000
+Subject: [PATCH] Detect OCI containers
+
+Podman using OCI containers sets container=oci in PID 1's environment.
+Detect that and print "oci" fact.
+
+This patch was originally contributed by Alessandro Valentini. I
+modified it and added tests and documentation.
+
+Reported-by: Alessandro Valentini
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2155233
+---
+ configure.ac | 2 +
+ tests/oci/Makefile.am | 28 ++
+ tests/oci/proc/1/environ | Bin 0 -> 124 bytes
+ tests/oci/proc/cpuinfo | 671 ++++++++++++++++++++++++++
+ tests/oci/sbin/dmidecode | 7 +
+ tests/oci/sbin/uname | 2 +
+ tests/oci/sbin/virt-what-cpuid-helper | 2 +
+ tests/oci/test.sh | 32 ++
+ virt-what.in | 6 +
+ virt-what.pod | 8 +-
+ 10 files changed, 757 insertions(+), 1 deletion(-)
+ create mode 100644 tests/oci/Makefile.am
+ create mode 100644 tests/oci/proc/1/environ
+ create mode 100644 tests/oci/proc/cpuinfo
+ create mode 100755 tests/oci/sbin/dmidecode
+ create mode 100755 tests/oci/sbin/uname
+ create mode 100755 tests/oci/sbin/virt-what-cpuid-helper
+ create mode 100755 tests/oci/test.sh
+
+diff --git a/configure.ac b/configure.ac
+index 8f808a38b..a80a4b6f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,6 +56,7 @@ tests="\
+ lx86 \
+ lxc \
+ nutanix-ahv \
++ oci \
+ parallels-desktop \
+ podman \
+ ppc64-baremetal \
+@@ -104,6 +105,7 @@ AC_CONFIG_FILES([Makefile
+ tests/lx86/Makefile
+ tests/lxc/Makefile
+ tests/nutanix-ahv/Makefile
++ tests/oci/Makefile
+ tests/parallels-desktop/Makefile
+ tests/podman/Makefile
+ tests/ppc64-baremetal/Makefile
+diff --git a/tests/oci/Makefile.am b/tests/oci/Makefile.am
+new file mode 100644
+index 000000000..b2f6f2469
+--- /dev/null
++++ b/tests/oci/Makefile.am
+@@ -0,0 +1,28 @@
++# Makefile for virt-what
++# Copyright (C) 2008-2023 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 \
++ sbin/dmidecode \
++ sbin/uname \
++ sbin/virt-what-cpuid-helper
+diff --git a/tests/oci/proc/1/environ b/tests/oci/proc/1/environ
+new file mode 100644
+index 0000000000000000000000000000000000000000..03d40a45377eaeccef15532734d2f5b7fd42234e
+GIT binary patch
+literal 124
+zcmWG=4DqnlFD)+8&&f|t%+W7S%FMGu;={QJ39t}^3uH2cxCZ&!R+OX`<uWAa=anR8
+r=A{<d<|k(|c=-Fe+UghO=a&GP!6AN*KyGSUVw$0Wg<+zpc`5?{dKM{B
+
+literal 0
+HcmV?d00001
+
+diff --git a/tests/oci/proc/cpuinfo b/tests/oci/proc/cpuinfo
+new file mode 100644
+index 000000000..82b147bb4
+--- /dev/null
++++ b/tests/oci/proc/cpuinfo
+@@ -0,0 +1,671 @@
++processor : 0
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 0
++cpu cores : 12
++apicid : 0
++initial apicid : 0
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 1
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 1
++cpu cores : 12
++apicid : 2
++initial apicid : 2
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 2
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 2
++cpu cores : 12
++apicid : 4
++initial apicid : 4
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 3
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 4
++cpu cores : 12
++apicid : 8
++initial apicid : 8
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 4
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 5
++cpu cores : 12
++apicid : 10
++initial apicid : 10
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 5
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 6
++cpu cores : 12
++apicid : 12
++initial apicid : 12
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 6
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2194.032
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 8
++cpu cores : 12
++apicid : 16
++initial apicid : 16
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 7
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 9
++cpu cores : 12
++apicid : 18
++initial apicid : 18
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 8
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 10
++cpu cores : 12
++apicid : 20
++initial apicid : 20
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 9
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 12
++cpu cores : 12
++apicid : 24
++initial apicid : 24
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 10
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 13
++cpu cores : 12
++apicid : 26
++initial apicid : 26
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 11
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 14
++cpu cores : 12
++apicid : 28
++initial apicid : 28
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 12
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2194.248
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 0
++cpu cores : 12
++apicid : 1
++initial apicid : 1
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 13
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 3973.398
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 1
++cpu cores : 12
++apicid : 3
++initial apicid : 3
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 14
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 2
++cpu cores : 12
++apicid : 5
++initial apicid : 5
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 15
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 4
++cpu cores : 12
++apicid : 9
++initial apicid : 9
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 16
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 5
++cpu cores : 12
++apicid : 11
++initial apicid : 11
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 17
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 6
++cpu cores : 12
++apicid : 13
++initial apicid : 13
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 18
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2195.748
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 8
++cpu cores : 12
++apicid : 17
++initial apicid : 17
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 19
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 9
++cpu cores : 12
++apicid : 19
++initial apicid : 19
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 20
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2196.733
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 10
++cpu cores : 12
++apicid : 21
++initial apicid : 21
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 21
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 12
++cpu cores : 12
++apicid : 25
++initial apicid : 25
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 22
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2200.000
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 13
++cpu cores : 12
++apicid : 27
++initial apicid : 27
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
++
++processor : 23
++vendor_id : AuthenticAMD
++cpu family : 23
++model : 113
++model name : AMD Ryzen 9 3900X 12-Core Processor
++stepping : 0
++microcode : 0x8701013
++cpu MHz : 2194.867
++cache size : 512 KB
++physical id : 0
++siblings : 24
++core id : 14
++cpu cores : 12
++apicid : 29
++initial apicid : 29
++fpu : yes
++fpu_exception : yes
++cpuid level : 16
++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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid aperfmperf rapl pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb cat_l3 cdp_l3 hw_pstate ssbd mba ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 cqm rdt_a rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local clzero irperf xsaveerptr rdpru wbnoinvd arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif v_spec_ctrl umip rdpid overflow_recov succor smca sev sev_es
++bugs : sysret_ss_attrs spectre_v1 spectre_v2 spec_store_bypass retbleed
++bogomips : 7585.66
++TLB size : 3072 4K pages
++clflush size : 64
++cache_alignment : 64
++address sizes : 43 bits physical, 48 bits virtual
++power management: ts ttp tm hwpstate cpb eff_freq_ro [13] [14]
+diff --git a/tests/oci/sbin/dmidecode b/tests/oci/sbin/dmidecode
+new file mode 100755
+index 000000000..48a6de126
+--- /dev/null
++++ b/tests/oci/sbin/dmidecode
+@@ -0,0 +1,7 @@
++#!/bin/sh -
++cat <<'EOF'
++# dmidecode 3.3
++Scanning /dev/mem for entry point.
++/dev/mem: No such file or directory
++EOF
++exit 1
+diff --git a/tests/oci/sbin/uname b/tests/oci/sbin/uname
+new file mode 100755
+index 000000000..ab0ec896d
+--- /dev/null
++++ b/tests/oci/sbin/uname
+@@ -0,0 +1,2 @@
++#!/bin/sh -
++echo x86_64
+diff --git a/tests/oci/sbin/virt-what-cpuid-helper b/tests/oci/sbin/virt-what-cpuid-helper
+new file mode 100755
+index 000000000..481e1e67c
+--- /dev/null
++++ b/tests/oci/sbin/virt-what-cpuid-helper
+@@ -0,0 +1,2 @@
++#!/bin/sh -
++# no output
+diff --git a/tests/oci/test.sh b/tests/oci/test.sh
+new file mode 100755
+index 000000000..5028ebc60
+--- /dev/null
++++ b/tests/oci/test.sh
+@@ -0,0 +1,32 @@
++# Test for OCI
++# Copyright (C) 2008-2023 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="oci"
++
++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 c6e4a1e00..102e23f67 100644
+--- a/virt-what.in
++++ b/virt-what.in
+@@ -192,6 +192,12 @@ if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
+ echo docker
+ fi
+
++# Check for OCI.
++if [ -e "${root}/proc/1/environ" ] &&
++ cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=oci'; then
++ echo oci
++fi
++
+ # Check for Podman.
+ if [ -e "${root}/proc/1/environ" ] &&
+ cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=podman'; then
+diff --git a/virt-what.pod b/virt-what.pod
+index 2c346bded..9dbc079f9 100644
+--- a/virt-what.pod
++++ b/virt-what.pod
+@@ -203,6 +203,12 @@ The guest is running inside Nutanix Acropolis Hypervisor (AHV).
+
+ Status: confirmed by RWMJ.
+
++=item B<oci>
++
++The guest is running in an OCI container.
++
++Status: contributed by Alessandro Valentini, confirmed by RWMJ
++
+ =item B<openvz>
+
+ The guest appears to be running inside an OpenVZ or Virtuozzo
+@@ -226,7 +232,7 @@ Status: contributed by Justin Clift
+
+ =item B<podman>
+
+-This is a Podman container.
++This is a Podman container. (See also C<oci> above.)
+
+ Status: contributed by Jordan Webb
+
+--
+2.31.1
+
diff --git a/SOURCES/0005-Add-support-for-Alibaba-cloud-on-aarch64.patch b/SOURCES/0005-Add-support-for-Alibaba-cloud-on-aarch64.patch
new file mode 100644
index 0000000..0043482
--- /dev/null
+++ b/SOURCES/0005-Add-support-for-Alibaba-cloud-on-aarch64.patch
@@ -0,0 +1,371 @@
+From 034981d94bf4ccac4159f013f2d4e2476a23d7e7 Mon Sep 17 00:00:00 2001
+From: Yongkui Guo <yoguo@redhat.com>
+Date: Mon, 30 Jan 2023 18:20:32 +0800
+Subject: [PATCH] Add support for Alibaba cloud on aarch64
+
+This assumes you are running RHEL or another tenant which supports
+ACPI. It probably won't work for guests using device tree.
+
+Also we assume that the hypervisor is KVM. Since the hypervisor
+indicates that it is RHEL 7, this is very likely to be true, but hard
+to prove since there is no CPUID on Arm.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2165285
+(cherry picked from commit 805604762468b754ea60e5dc176fa26f68d211b8)
+---
+ configure.ac | 2 +
+ tests/alibaba-cloud-arm/Makefile.am | 28 +++++
+ tests/alibaba-cloud-arm/proc/cpuinfo | 18 +++
+ tests/alibaba-cloud-arm/proc/self/status | 57 +++++++++
+ tests/alibaba-cloud-arm/sbin/dmidecode | 116 ++++++++++++++++++
+ tests/alibaba-cloud-arm/sbin/uname | 2 +
+ .../sbin/virt-what-cpuid-helper | 3 +
+ tests/alibaba-cloud-arm/test.sh | 33 +++++
+ virt-what.in | 5 +
+ 9 files changed, 264 insertions(+)
+ create mode 100644 tests/alibaba-cloud-arm/Makefile.am
+ create mode 100644 tests/alibaba-cloud-arm/proc/cpuinfo
+ create mode 100644 tests/alibaba-cloud-arm/proc/self/status
+ create mode 100755 tests/alibaba-cloud-arm/sbin/dmidecode
+ create mode 100755 tests/alibaba-cloud-arm/sbin/uname
+ create mode 100755 tests/alibaba-cloud-arm/sbin/virt-what-cpuid-helper
+ create mode 100755 tests/alibaba-cloud-arm/test.sh
+
+diff --git a/configure.ac b/configure.ac
+index a80a4b6f0..cfb7ca371 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-arm \
+ alibaba-cloud-x86 \
+ aws-baremetal-x86 \
+ aws-kvm-arm \
+@@ -83,6 +84,7 @@ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([virt-what],[chmod +x virt-what])
+ AC_CONFIG_FILES([Makefile
+ tests/Makefile
++ tests/alibaba-cloud-arm/Makefile
+ tests/alibaba-cloud-x86/Makefile
+ tests/aws-baremetal-x86/Makefile
+ tests/aws-kvm-arm/Makefile
+diff --git a/tests/alibaba-cloud-arm/Makefile.am b/tests/alibaba-cloud-arm/Makefile.am
+new file mode 100644
+index 000000000..09ce07861
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/Makefile.am
+@@ -0,0 +1,28 @@
++# Makefile for virt-what
++# Copyright (C) 2008-2023 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/alibaba-cloud-arm/proc/cpuinfo b/tests/alibaba-cloud-arm/proc/cpuinfo
+new file mode 100644
+index 000000000..03dbb22ab
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/proc/cpuinfo
+@@ -0,0 +1,18 @@
++processor : 0
++BogoMIPS : 50.00
++Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs
++CPU implementer : 0x41
++CPU architecture: 8
++CPU variant : 0x3
++CPU part : 0xd0c
++CPU revision : 1
++
++processor : 1
++BogoMIPS : 50.00
++Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs
++CPU implementer : 0x41
++CPU architecture: 8
++CPU variant : 0x3
++CPU part : 0xd0c
++CPU revision : 1
++
+diff --git a/tests/alibaba-cloud-arm/proc/self/status b/tests/alibaba-cloud-arm/proc/self/status
+new file mode 100644
+index 000000000..08c63e9cb
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/proc/self/status
+@@ -0,0 +1,57 @@
++Name: cat
++Umask: 0022
++State: R (running)
++Tgid: 6341
++Ngid: 0
++Pid: 6341
++PPid: 1588
++TracerPid: 0
++Uid: 0 0 0 0
++Gid: 0 0 0 0
++FDSize: 256
++Groups: 0
++NStgid: 6341
++NSpid: 6341
++NSpgid: 6341
++NSsid: 1588
++VmPeak: 2352 kB
++VmSize: 2352 kB
++VmLck: 0 kB
++VmPin: 0 kB
++VmHWM: 768 kB
++VmRSS: 768 kB
++RssAnon: 80 kB
++RssFile: 688 kB
++RssShmem: 0 kB
++VmData: 348 kB
++VmStk: 132 kB
++VmExe: 24 kB
++VmLib: 1728 kB
++VmPTE: 44 kB
++VmSwap: 0 kB
++HugetlbPages: 0 kB
++CoreDumping: 0
++THP_enabled: 1
++Threads: 1
++SigQ: 0/29002
++SigPnd: 0000000000000000
++ShdPnd: 0000000000000000
++SigBlk: 0000000000000000
++SigIgn: 0000000000000000
++SigCgt: 0000000000000000
++CapInh: 0000000000000000
++CapPrm: 000001ffffffffff
++CapEff: 000001ffffffffff
++CapBnd: 000001ffffffffff
++CapAmb: 0000000000000000
++NoNewPrivs: 0
++Seccomp: 0
++Seccomp_filters: 0
++Speculation_Store_Bypass: thread vulnerable
++SpeculationIndirectBranch: unknown
++Cpus_allowed: 3
++Cpus_allowed_list: 0-1
++Mems_allowed: 00000000,00000001
++Mems_allowed_list: 0
++voluntary_ctxt_switches: 0
++nonvoluntary_ctxt_switches: 0
+diff --git a/tests/alibaba-cloud-arm/sbin/dmidecode b/tests/alibaba-cloud-arm/sbin/dmidecode
+new file mode 100755
+index 000000000..89fa9a34b
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/sbin/dmidecode
+@@ -0,0 +1,116 @@
++#!/bin/sh -
++cat <<'EOF'
++# dmidecode 3.3
++Getting SMBIOS data from sysfs.
++SMBIOS 3.0.0 present.
++Table at 0x2348C0000.
++
++Handle 0x0100, DMI type 1, 27 bytes
++System Information
++ Manufacturer: Alibaba Cloud
++ Product Name: Alibaba Cloud ECS
++ Version: virt-rhel7.6.0
++ Serial Number: 8c43355a-242e-42c2-bdf7-9fae99316221
++ UUID: 8c43355a-242e-42c2-bdf7-9fae99316221
++ Wake-up Type: Power Switch
++ SKU Number: Not Specified
++ Family: Red Hat Enterprise Linux
++
++Handle 0x0300, DMI type 3, 21 bytes
++Chassis Information
++ Manufacturer: Alibaba Cloud
++ Type: Other
++ Lock: Not Present
++ Version: virt-rhel7.6.0
++ 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: 00 00 00 00 00 00 00 00
++ Version: virt-rhel7.6.0
++ 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: 2
++ Core Enabled: 2
++ 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: 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: 8 GB
++ 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 0x2000, DMI type 32, 11 bytes
++System Boot Information
++ Status: No errors detected
++
++Handle 0x0000, DMI type 0, 26 bytes
++BIOS Information
++ Vendor: EFI Development Kit II / OVMF
++ Version: 0.0.0
++ Release Date: 02/06/2015
++ Address: 0xE8000
++ Runtime Size: 96 kB
++ ROM Size: 64 kB
++ Characteristics:
++ BIOS characteristics not supported
++ Targeted content distribution is supported
++ UEFI is supported
++ System is a virtual machine
++ BIOS Revision: 0.0
++
++Handle 0xFEFF, DMI type 127, 4 bytes
++End Of Table
++
++EOF
+diff --git a/tests/alibaba-cloud-arm/sbin/uname b/tests/alibaba-cloud-arm/sbin/uname
+new file mode 100755
+index 000000000..bd33a2d73
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/sbin/uname
+@@ -0,0 +1,2 @@
++#!/bin/sh -
++echo aarch64
+diff --git a/tests/alibaba-cloud-arm/sbin/virt-what-cpuid-helper b/tests/alibaba-cloud-arm/sbin/virt-what-cpuid-helper
+new file mode 100755
+index 000000000..08e293436
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/sbin/virt-what-cpuid-helper
+@@ -0,0 +1,3 @@
++#!/bin/sh -
++# Arm, so no cpuid.
++# No output, exits with 0.
+diff --git a/tests/alibaba-cloud-arm/test.sh b/tests/alibaba-cloud-arm/test.sh
+new file mode 100755
+index 000000000..1e7360931
+--- /dev/null
++++ b/tests/alibaba-cloud-arm/test.sh
+@@ -0,0 +1,33 @@
++# Test for Alibaba Cloud
++# Copyright (C) 2018-2023 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
+diff --git a/virt-what.in b/virt-what.in
+index 102e23f67..fbf8c54c5 100644
+--- a/virt-what.in
++++ b/virt-what.in
+@@ -354,6 +354,11 @@ if ! "$skip_qemu_kvm"; then
+ # This is for AWS Graviton (Arm) systems which don't have CPUID.
+ echo kvm
+ skip_lkvm=true
++ elif echo "$dmi" | grep -q 'Manufacturer: Alibaba Cloud' &&
++ echo "$dmi" | grep -q 'System is a virtual machine'; then
++ # This is for Alibaba Arm systems which don't have CPUID.
++ echo kvm
++ skip_lkvm=true
+ elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
+ # The test for KVM above failed, so now we know we're
+ # not using KVM acceleration.
+--
+2.31.1
+
diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh
index af8f647..01507ca 100755
--- a/SOURCES/copy-patches.sh
+++ b/SOURCES/copy-patches.sh
@@ -8,7 +8,7 @@ set -e
# ./copy-patches.sh
project=virt-what
-rhel_version=9.1
+rhel_version=9.2
# Check we're in the right directory.
if [ ! -f $project.spec ]; then
diff --git a/SPECS/virt-what.spec b/SPECS/virt-what.spec
index 47c507a..5d8c955 100644
--- a/SPECS/virt-what.spec
+++ b/SPECS/virt-what.spec
@@ -1,6 +1,6 @@
Name: virt-what
Version: 1.25
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Detect if we are running in a virtual machine
License: GPLv2+
@@ -11,10 +11,14 @@ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi
Source1: copy-patches.sh
# Patches are maintained in the following repository:
-# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-9.1
+# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-9.2
# Patches.
-#(no patches)
+Patch0001: 0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch
+Patch0002: 0002-Move-docker-and-podman-tests-up-add-comments.patch
+Patch0003: 0003-podman-Fix-location-of-test-file-proc-1-environ.patch
+Patch0004: 0004-Detect-OCI-containers.patch
+Patch0005: 0005-Add-support-for-Alibaba-cloud-on-aarch64.patch
BuildRequires: make
BuildRequires: git
@@ -121,6 +125,14 @@ fi
%changelog
+* Mon Jan 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-3
+- Add support for Alibaba Cloud on aarch64
+ resolves: rhbz#2165285
+
+* Thu Jan 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-2
+- Add support for OCI containers
+ resolves: rhbz#2155233
+
* Wed Aug 17 2022 Richard W.M. Jones <rjones@redhat.com> - 1.25-1
- Rebase to 1.25
resolves: rhbz#2118997