diff --git a/.gitignore b/.gitignore index 58a512e..5f64095 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /virt-what-*.tar.gz -/virt-what-*.tar.gz.sig diff --git a/0001-virt-what-detect-systemd-nspawn.patch b/0001-virt-what-detect-systemd-nspawn.patch deleted file mode 100644 index 218bea0..0000000 --- a/0001-virt-what-detect-systemd-nspawn.patch +++ /dev/null @@ -1,513 +0,0 @@ -From 5315e2b57b2df54b294893adc5185c474985bcc2 Mon Sep 17 00:00:00 2001 -From: Jochen Kellner -Date: Mon, 9 Sep 2024 19:18:42 +0200 -Subject: [PATCH 1/2] virt-what: detect systemd-nspawn - -The following patch adds detection of systemd-nspawn containers to -virt-what for me. It is inspired by systemd-detect-virt which also -looks at /proc/1/environ. ---- - configure.ac | 2 + - tests/nspawn/Makefile.am | 30 +++ - tests/nspawn/proc/1/environ | Bin 0 -> 262 bytes - tests/nspawn/proc/cpuinfo | 224 +++++++++++++++++++++++ - tests/nspawn/proc/self/status | 61 ++++++ - tests/nspawn/run/host/container-manager | 5 + - tests/nspawn/sbin/dmidecode | 7 + - tests/nspawn/sbin/uname | 2 + - tests/nspawn/sbin/virt-what-cpuid-helper | 2 + - tests/nspawn/test.sh | 32 ++++ - virt-what.in | 6 + - virt-what.pod | 6 + - 12 files changed, 377 insertions(+) - create mode 100644 tests/nspawn/Makefile.am - create mode 100644 tests/nspawn/proc/1/environ - create mode 100644 tests/nspawn/proc/cpuinfo - create mode 100644 tests/nspawn/proc/self/status - create mode 100755 tests/nspawn/run/host/container-manager - create mode 100755 tests/nspawn/sbin/dmidecode - create mode 100755 tests/nspawn/sbin/uname - create mode 100755 tests/nspawn/sbin/virt-what-cpuid-helper - create mode 100755 tests/nspawn/test.sh - -diff --git a/configure.ac b/configure.ac -index e93d237..2882db4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,7 @@ tests="\ - lkvm-arm \ - lx86 \ - lxc \ -+ nspawn \ - nutanix-ahv \ - oci \ - parallels-desktop \ -@@ -112,6 +113,7 @@ AC_CONFIG_FILES([Makefile - tests/lkvm-arm/Makefile - tests/lx86/Makefile - tests/lxc/Makefile -+ tests/nspawn/Makefile - tests/nutanix-ahv/Makefile - tests/oci/Makefile - tests/parallels-desktop/Makefile -diff --git a/tests/nspawn/Makefile.am b/tests/nspawn/Makefile.am -new file mode 100644 -index 0000000..e566063 ---- /dev/null -+++ b/tests/nspawn/Makefile.am -@@ -0,0 +1,30 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2024 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 \ -+ run/host/container-manager \ -+ sbin/dmidecode \ -+ sbin/uname \ -+ sbin/virt-what-cpuid-helper -diff --git a/tests/nspawn/proc/1/environ b/tests/nspawn/proc/1/environ -new file mode 100644 -index 0000000000000000000000000000000000000000..918a77694ad4a0821246c14db4c5976f001a6982 -GIT binary patch -literal 262 -zcmZ9ET?>LR7=`zT#>!MG*hPeWP->)IbS0ac^g_LhZ5ICf$e^UV^PGos4vTWbS?esj -znp#|$lYsL9fAJ^!>Vp!H)CRo()Rw!>d3{q9-CaD9Z1ObW%o^j#sYs5zPy2kGEz;xz -z-)Yshpm;1I5h$&xid93y$)u*!D5_}~H(JV3D4JkKvb@}`&Q*~wcS*^aZINA!^9+rL -arW;(o+v=gM1A`SPJ`VmRD6X^wf#d~ua$48` - -literal 0 -HcmV?d00001 - -diff --git a/tests/nspawn/proc/cpuinfo b/tests/nspawn/proc/cpuinfo -new file mode 100644 -index 0000000..243aa53 ---- /dev/null -+++ b/tests/nspawn/proc/cpuinfo -@@ -0,0 +1,224 @@ -+processor : 0 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 800.000 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 0 -+cpu cores : 4 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 1 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 3999.967 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 1 -+cpu cores : 4 -+apicid : 2 -+initial apicid : 2 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 2 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 800.000 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 2 -+cpu cores : 4 -+apicid : 4 -+initial apicid : 4 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 3 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 3975.686 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 3 -+cpu cores : 4 -+apicid : 6 -+initial apicid : 6 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 4 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 800.000 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 0 -+cpu cores : 4 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 5 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 3955.023 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 1 -+cpu cores : 4 -+apicid : 3 -+initial apicid : 3 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 6 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 3846.764 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 2 -+cpu cores : 4 -+apicid : 5 -+initial apicid : 5 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -+processor : 7 -+vendor_id : GenuineIntel -+cpu family : 6 -+model : 94 -+model name : Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz -+stepping : 3 -+microcode : 0xf0 -+cpu MHz : 3892.180 -+cache size : 8192 KB -+physical id : 0 -+siblings : 8 -+core id : 3 -+cpu cores : 4 -+apicid : 7 -+initial apicid : 7 -+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 dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp vnmi md_clear flush_l1d arch_capabilities -+vmx flags : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml -+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds mmio_stale_data retbleed gds -+bogomips : 6799.81 -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 39 bits physical, 48 bits virtual -+power management: -+ -diff --git a/tests/nspawn/proc/self/status b/tests/nspawn/proc/self/status -new file mode 100644 -index 0000000..e1c867a ---- /dev/null -+++ b/tests/nspawn/proc/self/status -@@ -0,0 +1,61 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 2359 -+Ngid: 0 -+Pid: 2359 -+PPid: 2049 -+TracerPid: 0 -+Uid: 0 0 0 0 -+Gid: 0 0 0 0 -+FDSize: 256 -+Groups: -+NStgid: 2359 -+NSpid: 2359 -+NSpgid: 2359 -+NSsid: 2049 -+Kthread: 0 -+VmPeak: 3044 kB -+VmSize: 3044 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 1408 kB -+VmRSS: 1408 kB -+RssAnon: 0 kB -+RssFile: 1408 kB -+RssShmem: 0 kB -+VmData: 360 kB -+VmStk: 132 kB -+VmExe: 20 kB -+VmLib: 1520 kB -+VmPTE: 44 kB -+VmSwap: 0 kB -+HugetlbPages: 0 kB -+CoreDumping: 0 -+THP_enabled: 1 -+untag_mask: 0xffffffffffffffff -+Threads: 1 -+SigQ: 0/127646 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 00000000fdecbfff -+CapEff: 00000000fdecbfff -+CapBnd: 00000000fdecbfff -+CapAmb: 0000000000000000 -+NoNewPrivs: 0 -+Seccomp: 2 -+Seccomp_filters: 5 -+Speculation_Store_Bypass: thread vulnerable -+SpeculationIndirectBranch: conditional enabled -+Cpus_allowed: ff -+Cpus_allowed_list: 0-7 -+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: 0 -+x86_Thread_features: -+x86_Thread_features_locked: -diff --git a/tests/nspawn/run/host/container-manager b/tests/nspawn/run/host/container-manager -new file mode 100755 -index 0000000..e8bd250 ---- /dev/null -+++ b/tests/nspawn/run/host/container-manager -@@ -0,0 +1,5 @@ -+#!/bin/sh - -+cat <<'EOF' -+systemd-nspawn -+EOF -+exit 0 -diff --git a/tests/nspawn/sbin/dmidecode b/tests/nspawn/sbin/dmidecode -new file mode 100755 -index 0000000..78e5cea ---- /dev/null -+++ b/tests/nspawn/sbin/dmidecode -@@ -0,0 +1,7 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.4 -+Scanning /dev/mem for entry point. -+/dev/mem: No such file or directory -+EOF -+exit 1 -diff --git a/tests/nspawn/sbin/uname b/tests/nspawn/sbin/uname -new file mode 100755 -index 0000000..ab0ec89 ---- /dev/null -+++ b/tests/nspawn/sbin/uname -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+echo x86_64 -diff --git a/tests/nspawn/sbin/virt-what-cpuid-helper b/tests/nspawn/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..481e1e6 ---- /dev/null -+++ b/tests/nspawn/sbin/virt-what-cpuid-helper -@@ -0,0 +1,2 @@ -+#!/bin/sh - -+# no output -diff --git a/tests/nspawn/test.sh b/tests/nspawn/test.sh -new file mode 100755 -index 0000000..09e5b9a ---- /dev/null -+++ b/tests/nspawn/test.sh -@@ -0,0 +1,32 @@ -+# Test for systemd-nspawn -+# Copyright (C) 2008-2024 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="systemd_nspawn" -+ -+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 ba35cc5..39f0497 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -238,6 +238,12 @@ elif grep -qF /libpod- "${root}/proc/self/cgroup" 2>/dev/null; then - echo podman - fi - -+# Check for container=systemd-nspawn -+if [ -e "${root}/proc/1/environ" ] && -+ cat "${root}/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container=systemd-nspawn'; then -+ echo systemd_nspawn -+fi -+ - # Check for Linux-VServer - if test -e "${root}/proc/self/status" \ - && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then -diff --git a/virt-what.pod b/virt-what.pod -index d5eeb76..0eb0b93 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -270,6 +270,12 @@ The guest is running on the Red Hat hypervisor. - - Status: confirmed by RWMJ - -+=item B -+ -+This process is running in a systemd nspawn container. -+ -+Status: contributed by Jochen Kellner -+ - =item B - - This is a User-Mode Linux (UML) guest. --- -2.49.0 - diff --git a/0002-Add-support-for-WSL2.patch b/0002-Add-support-for-WSL2.patch deleted file mode 100644 index 8301d69..0000000 --- a/0002-Add-support-for-WSL2.patch +++ /dev/null @@ -1,1172 +0,0 @@ -From 7b5e2366f0af34c3e5a651aea3a6a6e8bdef3ca8 Mon Sep 17 00:00:00 2001 -From: Scott Herold -Date: Fri, 2 May 2025 21:01:35 +0100 -Subject: [PATCH 2/2] Add support for WSL2 - ---- - configure.ac | 2 + - tests/wsl2/Makefile.am | 28 + - tests/wsl2/proc/cpuinfo | 896 +++++++++++++++++++++++++ - tests/wsl2/proc/self/status | 57 ++ - tests/wsl2/sbin/dmidecode | 7 + - tests/wsl2/sbin/uname | 11 + - tests/wsl2/sbin/virt-what-cpuid-helper | 3 + - tests/wsl2/test.sh | 32 + - virt-what.in | 11 +- - virt-what.pod | 6 + - 10 files changed, 1050 insertions(+), 3 deletions(-) - create mode 100644 tests/wsl2/Makefile.am - create mode 100644 tests/wsl2/proc/cpuinfo - create mode 100644 tests/wsl2/proc/self/status - create mode 100755 tests/wsl2/sbin/dmidecode - create mode 100755 tests/wsl2/sbin/uname - create mode 100755 tests/wsl2/sbin/virt-what-cpuid-helper - create mode 100755 tests/wsl2/test.sh - -diff --git a/configure.ac b/configure.ac -index 2882db4..199bb9f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,6 +79,7 @@ tests="\ - rhev \ - upcloud \ - vmm \ -+ wsl2 \ - xen-arm \ - zvm \ - " -@@ -133,6 +134,7 @@ AC_CONFIG_FILES([Makefile - tests/rhev/Makefile - tests/upcloud/Makefile - tests/vmm/Makefile -+ tests/wsl2/Makefile - tests/xen-arm/Makefile - tests/zvm/Makefile - ]) -diff --git a/tests/wsl2/Makefile.am b/tests/wsl2/Makefile.am -new file mode 100644 -index 0000000..aa7f4ba ---- /dev/null -+++ b/tests/wsl2/Makefile.am -@@ -0,0 +1,28 @@ -+# Makefile for virt-what -+# Copyright (C) 2008-2025 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/wsl2/proc/cpuinfo b/tests/wsl2/proc/cpuinfo -new file mode 100644 -index 0000000..eb39d36 ---- /dev/null -+++ b/tests/wsl2/proc/cpuinfo -@@ -0,0 +1,896 @@ -+processor : 0 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 0 -+cpu cores : 16 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 1 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 0 -+cpu cores : 16 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 2 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 1 -+cpu cores : 16 -+apicid : 2 -+initial apicid : 2 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 3 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 1 -+cpu cores : 16 -+apicid : 3 -+initial apicid : 3 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 4 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 2 -+cpu cores : 16 -+apicid : 4 -+initial apicid : 4 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 5 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 2 -+cpu cores : 16 -+apicid : 5 -+initial apicid : 5 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 6 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 3 -+cpu cores : 16 -+apicid : 6 -+initial apicid : 6 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 7 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 3 -+cpu cores : 16 -+apicid : 7 -+initial apicid : 7 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 8 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 4 -+cpu cores : 16 -+apicid : 8 -+initial apicid : 8 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 9 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 4 -+cpu cores : 16 -+apicid : 9 -+initial apicid : 9 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 10 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 5 -+cpu cores : 16 -+apicid : 10 -+initial apicid : 10 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 11 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 5 -+cpu cores : 16 -+apicid : 11 -+initial apicid : 11 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 12 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 6 -+cpu cores : 16 -+apicid : 12 -+initial apicid : 12 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 13 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 6 -+cpu cores : 16 -+apicid : 13 -+initial apicid : 13 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 14 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 7 -+cpu cores : 16 -+apicid : 14 -+initial apicid : 14 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 15 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 7 -+cpu cores : 16 -+apicid : 15 -+initial apicid : 15 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 16 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 8 -+cpu cores : 16 -+apicid : 16 -+initial apicid : 16 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 17 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 8 -+cpu cores : 16 -+apicid : 17 -+initial apicid : 17 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 18 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 9 -+cpu cores : 16 -+apicid : 18 -+initial apicid : 18 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 19 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 9 -+cpu cores : 16 -+apicid : 19 -+initial apicid : 19 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 20 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 10 -+cpu cores : 16 -+apicid : 20 -+initial apicid : 20 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 21 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 10 -+cpu cores : 16 -+apicid : 21 -+initial apicid : 21 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 22 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 11 -+cpu cores : 16 -+apicid : 22 -+initial apicid : 22 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 23 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 11 -+cpu cores : 16 -+apicid : 23 -+initial apicid : 23 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 24 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 12 -+cpu cores : 16 -+apicid : 24 -+initial apicid : 24 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 25 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 12 -+cpu cores : 16 -+apicid : 25 -+initial apicid : 25 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 26 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 13 -+cpu cores : 16 -+apicid : 26 -+initial apicid : 26 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 27 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 13 -+cpu cores : 16 -+apicid : 27 -+initial apicid : 27 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 28 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 14 -+cpu cores : 16 -+apicid : 28 -+initial apicid : 28 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 29 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 14 -+cpu cores : 16 -+apicid : 29 -+initial apicid : 29 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 30 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 15 -+cpu cores : 16 -+apicid : 30 -+initial apicid : 30 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -+processor : 31 -+vendor_id : AuthenticAMD -+cpu family : 25 -+model : 97 -+model name : AMD Ryzen 9 7950X3D 16-Core Processor -+stepping : 2 -+microcode : 0xffffffff -+cpu MHz : 4199.785 -+cache size : 1024 KB -+physical id : 0 -+siblings : 32 -+core id : 15 -+cpu cores : 16 -+apicid : 31 -+initial apicid : 31 -+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 mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl tsc_reliable nonstop_tsc cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy svm cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core ssbd ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt clwb avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves avx512_bf16 clzero xsaveerptr arat npt nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold v_vmsave_vmload avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm -+bugs : sysret_ss_attrs null_seg spectre_v1 spectre_v2 spec_store_bypass srso -+bogomips : 8399.57 -+TLB size : 3584 4K pages -+clflush size : 64 -+cache_alignment : 64 -+address sizes : 48 bits physical, 48 bits virtual -+power management: -+ -diff --git a/tests/wsl2/proc/self/status b/tests/wsl2/proc/self/status -new file mode 100644 -index 0000000..37a0a47 ---- /dev/null -+++ b/tests/wsl2/proc/self/status -@@ -0,0 +1,57 @@ -+Name: cat -+Umask: 0022 -+State: R (running) -+Tgid: 16906 -+Ngid: 0 -+Pid: 16906 -+PPid: 4346 -+TracerPid: 0 -+Uid: 1000 1000 1000 1000 -+Gid: 1000 1000 1000 1000 -+FDSize: 256 -+Groups: 10 1000 -+NStgid: 16906 -+NSpid: 16906 -+NSpgid: 16906 -+NSsid: 4346 -+VmPeak: 7976 kB -+VmSize: 7976 kB -+VmLck: 0 kB -+VmPin: 0 kB -+VmHWM: 1272 kB -+VmRSS: 1272 kB -+RssAnon: 168 kB -+RssFile: 1104 kB -+RssShmem: 0 kB -+VmData: 484 kB -+VmStk: 132 kB -+VmExe: 896 kB -+VmLib: 2244 kB -+VmPTE: 52 kB -+VmSwap: 0 kB -+HugetlbPages: 0 kB -+CoreDumping: 0 -+THP_enabled: 1 -+Threads: 1 -+SigQ: 1/127571 -+SigPnd: 0000000000000000 -+ShdPnd: 0000000000000000 -+SigBlk: 0000000000000000 -+SigIgn: 0000000000000000 -+SigCgt: 0000000000000000 -+CapInh: 0000000000000000 -+CapPrm: 0000000000000000 -+CapEff: 0000000000000000 -+CapBnd: 000001ffffffffff -+CapAmb: 0000000000000000 -+NoNewPrivs: 0 -+Seccomp: 0 -+Seccomp_filters: 0 -+Speculation_Store_Bypass: thread vulnerable -+SpeculationIndirectBranch: conditional enabled -+Cpus_allowed: ffffffff -+Cpus_allowed_list: 0-31 -+Mems_allowed: 1 -+Mems_allowed_list: 0 -+voluntary_ctxt_switches: 6 -+nonvoluntary_ctxt_switches: 0 -\ No newline at end of file -diff --git a/tests/wsl2/sbin/dmidecode b/tests/wsl2/sbin/dmidecode -new file mode 100755 -index 0000000..5d09059 ---- /dev/null -+++ b/tests/wsl2/sbin/dmidecode -@@ -0,0 +1,7 @@ -+#!/bin/sh - -+cat <<'EOF' -+# dmidecode 3.6 -+Scanning /dev/mem for entry point. -+# No SMBIOS nor DMI entry point found, sorry. -+EOF -+exit 1 -diff --git a/tests/wsl2/sbin/uname b/tests/wsl2/sbin/uname -new file mode 100755 -index 0000000..47af99f ---- /dev/null -+++ b/tests/wsl2/sbin/uname -@@ -0,0 +1,11 @@ -+#!/bin/sh - -+# Enable expected output for arch check as well as kernel release name -+# required to determine WSL2 with uname -r -+while getopts ":r" option; do -+ case $option in -+ r) # display kernel release name -+ echo microsoft-standard-WSL2 -+ exit;; -+ esac -+done -+echo x86_64 -diff --git a/tests/wsl2/sbin/virt-what-cpuid-helper b/tests/wsl2/sbin/virt-what-cpuid-helper -new file mode 100755 -index 0000000..1604462 ---- /dev/null -+++ b/tests/wsl2/sbin/virt-what-cpuid-helper -@@ -0,0 +1,3 @@ -+#!/bin/sh - -+echo "Microsoft Hv" -+ -diff --git a/tests/wsl2/test.sh b/tests/wsl2/test.sh -new file mode 100755 -index 0000000..936a992 ---- /dev/null -+++ b/tests/wsl2/test.sh -@@ -0,0 +1,32 @@ -+# Test for Microsoft WSL2. -+# Copyright (C) 2008-2025 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="wsl2" -+ -+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 39f0497..61481d3 100644 ---- a/virt-what.in -+++ b/virt-what.in -@@ -109,7 +109,8 @@ cpuid=$(virt-what-cpuid-helper) - dmi=$(LANG=C dmidecode 2>&1) - - # Architecture. --# Note for the purpose of testing, we only call uname with -m option. -+# Note for the purpose of testing, we only call uname with -m option -+# (except WSL2 which is weird). - - arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') - -@@ -150,9 +151,13 @@ elif echo "$dmi" | grep -q 'Manufacturer: VMware'; then - echo vmware - fi - --# Check for Hyper-V. -+# Check for WSL2. -+kernel=$(uname -r) -+if echo "$kernel" | grep -q 'microsoft-standard-WSL2' ; then -+ echo wsl2 -+# If not WSL2 based on the running kernel, check for native Hyper-V. - # http://blogs.msdn.com/b/sqlosteam/archive/2010/10/30/is-this-real-the-metaphysics-of-hardware-virtualization.aspx --if [ "$cpuid" = "Microsoft Hv" ]; then -+elif [ "$cpuid" = "Microsoft Hv" ]; then - echo hyperv - # Hyper-V on ARM doesn't have CPUID. Use the information in dmidecode - # instead. Note this is similar to VirtualPC below. -diff --git a/virt-what.pod b/virt-what.pod -index 0eb0b93..2b7d34c 100644 ---- a/virt-what.pod -+++ b/virt-what.pod -@@ -328,6 +328,12 @@ The guest appears to be running on VMware hypervisor. - - Status: confirmed by RWMJ - -+=item B -+ -+The guest appears to be running on Windows Subsystem for Linux 2 (WSL2). -+ -+Status: contributed by Scott Herold -+ - =item B - - The guest appears to be running on Xen hypervisor. --- -2.49.0 - diff --git a/copy-patches.sh b/copy-patches.sh deleted file mode 100755 index a06bf23..0000000 --- a/copy-patches.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/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=10.0 - -# 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/gating.yaml b/gating.yaml deleted file mode 100755 index f7046e8..0000000 --- a/gating.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: 3rd-esxi-x86_64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: 3rd-esxi-aarch64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: 3rd-hyperv-2019-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-aws-ci_x86_64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-aws-ci_aarch64.brew-build.tier1.functional} diff --git a/libguestfs.keyring b/libguestfs.keyring deleted file mode 100644 index bb3eb55..0000000 Binary files a/libguestfs.keyring and /dev/null differ diff --git a/sources b/sources index 4ae525a..7055766 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (virt-what-1.27.tar.gz) = 8d10111e38a87504daccf36e9386863aa92308c96be65164412d92c56c12d42f38e6e251fabe7945ce74e1419fc82c0ac3cdbd0f25b19cd72feda2e199307d6f -SHA512 (virt-what-1.27.tar.gz.sig) = d3b189ba579388082f489219f1051841b888188f865d4718a49da0d85fde64c5d6ca5fa44dd33ef782f2d615444a6d942241a6de5722360f724344320acf1370 +SHA512 (virt-what-1.19.tar.gz) = 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820 diff --git a/tests/basic-test.sh b/tests/basic-test.sh deleted file mode 100755 index e1dc226..0000000 --- a/tests/basic-test.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e -set -x - -# This test requires root to run. -virt-what diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 46cdaf4..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - virt-what - tests: - - simple: - dir: . - run: ./basic-test.sh diff --git a/virt-what.spec b/virt-what.spec index c78c0bd..c6cc562 100644 --- a/virt-what.spec +++ b/virt-what.spec @@ -1,32 +1,18 @@ Name: virt-what -Version: 1.27 -Release: 4%{?dist} +Version: 1.19 +Release: 3%{?dist} Summary: Detect if we are running in a virtual machine -License: GPL-2.0-or-later +License: GPLv2+ URL: http://people.redhat.com/~rjones/virt-what/ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz -Source1: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz.sig -# Keyring used to verify tarball signature. -Source2: libguestfs.keyring - -# Maintainer script which helps with handling patches. -Source3: copy-patches.sh - -# Add detection of systemd-nspawn (upstream) -Patch: 0001-virt-what-detect-systemd-nspawn.patch -# Add detection of WSL2 (upstream) -Patch: 0002-Add-support-for-WSL2.patch - -BuildRequires: gcc -BuildRequires: make BuildRequires: git -BuildRequires: autoconf, automake, libtool -BuildRequires: /usr/bin/pod2man -# Required to verify tarball signature. -BuildRequires: gnupg2 +# 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). BuildRequires: util-linux @@ -56,150 +42,68 @@ know about or can't detect. Current types of virtualization detected: - - 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) + - aws Amazon Web Services + - bhyve FreeBSD hypervisor + - docker Docker container + - hyperv Microsoft Hyper-V + - ibm_power-kvm + IBM POWER KVM + - ibm_power-lpar_shared - ibm_power-lpar_dedicated - - 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) + 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) %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -S git -# Always rebuild upstream autotools files. -autoreconf -i - %build -%configure || { cat config.log; exit 1; } +%configure make %install -%make_install +make install DESTDIR=$RPM_BUILD_ROOT %check -if ! make -k check ; then - find -name test-suite.log -exec cat {} \; +if ! make check ; then + cat test-suite.log exit 1 fi %files %doc README COPYING %{_sbindir}/virt-what -%{_sbindir}/virt-what-cvm %{_libexecdir}/virt-what-cpuid-helper %{_mandir}/man1/*.1* %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.27-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue May 06 2025 Richard W.M. Jones - 1.27-3 -- Add support for systemd-nspawn and WSL2 - -* Sun Jan 19 2025 Fedora Release Engineering - 1.27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Aug 31 2024 Richard W.M. Jones - 1.27-1 -- New upstream version 1.27 - -* Sat Jul 20 2024 Fedora Release Engineering - 1.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 02 2024 Richard W.M. Jones - 1.26-1 -- New upstream version 1.26 -- Add new binary virt-what-cvm (for confidential VMs). - -* Sat Jan 27 2024 Fedora Release Engineering - 1.25-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.25-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 05 2023 Richard W.M. Jones - 1.25-3 -- Migrated to SPDX license - -* Sat Jan 21 2023 Fedora Release Engineering - 1.25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Aug 17 2022 Richard W.M. Jones - 1.25-1 -- New upstream version 1.25 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jun 23 2022 Richard W.M. Jones - 1.24-1 -- New upstream version 1.24 -- Update list of supported hypervisors -- Fix %%check for failures - -* Thu Apr 14 2022 Richard W.M. Jones - 1.22-2 -- New upstream version 1.22. -- Fix Source0 line. - -* Sat Jan 22 2022 Fedora Release Engineering - 1.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Apr 19 2021 Richard W.M. Jones - 1.21-1 -- New upstream version 1.21. - -* Tue Apr 13 2021 Richard W.M. Jones - 1.21-0.1 -- Add all patches since 1.20 in preparation for 1.21 release. - -* Wed Jan 27 2021 Fedora Release Engineering - 1.20-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Tom Stellard - 1.20-3 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Fri Jan 31 2020 Fedora Release Engineering - 1.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 3 2019 Richard W.M. Jones - 1.20-1 -- New upstream version 1.20. - * Sat Jul 27 2019 Fedora Release Engineering - 1.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild