Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-what for openSUSE:Factory checked in at 2022-12-05 18:01:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-what (Old) and /work/SRC/openSUSE:Factory/.virt-what.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-what" Mon Dec 5 18:01:12 2022 rev:9 rq:1040083 version:1.25 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-what/virt-what.changes 2021-09-20 23:36:26.247417022 +0200 +++ /work/SRC/openSUSE:Factory/.virt-what.new.1835/virt-what.changes 2022-12-05 18:01:16.912607956 +0100 @@ -1,0 +2,14 @@ +Sun Dec 4 22:08:38 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 1.25: + * detect AWS arm virtual instance as kvm + * google-cloud: Print "kvm" fact on aarch64 instances + * illumos-lx: Fix test so it works under virtualization + * Detect Illumos (SmartOS/OmniOS) LX virtualization + * Add detection of Red Hat's hypervisor + * Display kvm/qemu fact for Nutanix AHV + * Add support for Alibaba Cloud Linux + * Add support for VMware ESXi on ARM + * aws: Match multi-digit version number in BIOS information + +------------------------------------------------------------------- Old: ---- virt-what-1.21.tar.gz virt-what-1.21.tar.gz.sig New: ---- virt-what-1.25.tar.gz virt-what-1.25.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-what.spec ++++++ --- /var/tmp/diff_new_pack.LxzXuC/_old 2022-12-05 18:01:17.492611115 +0100 +++ /var/tmp/diff_new_pack.LxzXuC/_new 2022-12-05 18:01:17.496611137 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-what # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: virt-what -Version: 1.21 +Version: 1.25 Release: 0 Summary: Detect if running in a virtual machine License: GPL-2.0-or-later ++++++ virt-what-1.21.tar.gz -> virt-what-1.25.tar.gz ++++++ ++++ 5107 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/configure.ac new/virt-what-1.25/configure.ac --- old/virt-what-1.21/configure.ac 2021-04-19 13:56:40.000000000 +0200 +++ new/virt-what-1.25/configure.ac 2022-08-17 11:52:37.000000000 +0200 @@ -1,5 +1,5 @@ # virt-what -# Copyright (C) 2008-2018 Red Hat Inc. +# Copyright (C) 2008-2022 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 @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -AC_INIT([virt-what],[1.21]) +AC_INIT([virt-what],[1.25]) AM_INIT_AUTOMAKE([foreign]) dnl Check for basic C environment. @@ -34,6 +34,7 @@ dnl List of tests. tests="\ + alibaba-cloud-x86 \ aws-baremetal-x86 \ aws-kvm-arm \ aws-kvm-x86 \ @@ -41,8 +42,11 @@ baremetal \ bhyve \ docker \ + esx-arm \ esx4.1 \ + google-cloud \ hyperv \ + illumos-lx \ kvm \ kvm-explicit-cpu \ ldoms \ @@ -78,6 +82,7 @@ AC_CONFIG_FILES([virt-what],[chmod +x virt-what]) AC_CONFIG_FILES([Makefile tests/Makefile + tests/alibaba-cloud-x86/Makefile tests/aws-baremetal-x86/Makefile tests/aws-kvm-arm/Makefile tests/aws-kvm-x86/Makefile @@ -85,8 +90,11 @@ tests/baremetal/Makefile tests/bhyve/Makefile tests/docker/Makefile + tests/esx-arm/Makefile tests/esx4.1/Makefile + tests/google-cloud/Makefile tests/hyperv/Makefile + tests/illumos-lx/Makefile tests/kvm/Makefile tests/kvm-explicit-cpu/Makefile tests/ldoms/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/Makefile.am new/virt-what-1.25/tests/alibaba-cloud-x86/Makefile.am --- old/virt-what-1.21/tests/alibaba-cloud-x86/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/Makefile.am 2022-04-14 14:50:16.000000000 +0200 @@ -0,0 +1,28 @@ +# Makefile for virt-what +# Copyright (C) 2008-2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +CLEANFILES = *~ + +TESTS = test.sh + +EXTRA_DIST = \ + test.sh \ + proc/cpuinfo \ + proc/self/status \ + sbin/dmidecode \ + sbin/uname \ + sbin/virt-what-cpuid-helper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/proc/cpuinfo new/virt-what-1.25/tests/alibaba-cloud-x86/proc/cpuinfo --- old/virt-what-1.21/tests/alibaba-cloud-x86/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/proc/cpuinfo 2021-05-27 11:53:40.000000000 +0200 @@ -0,0 +1,53 @@ +processor : 0 +vendor_id : GenuineIntel +cpu family : 6 +model : 85 +model name : Intel(R) Xeon(R) Platinum 8269CY CPU @ 2.50GHz +stepping : 7 +microcode : 0x1 +cpu MHz : 2500.002 +cache size : 36608 KB +physical id : 0 +siblings : 2 +core id : 0 +cpu cores : 1 +apicid : 0 +initial apicid : 0 +fpu : yes +fpu_exception : yes +cpuid level : 22 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid tsc_known_freq pni pclmulqdq monitor ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves arat avx512_vnni +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit +bogomips : 5000.00 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: + +processor : 1 +vendor_id : GenuineIntel +cpu family : 6 +model : 85 +model name : Intel(R) Xeon(R) Platinum 8269CY CPU @ 2.50GHz +stepping : 7 +microcode : 0x1 +cpu MHz : 2500.002 +cache size : 36608 KB +physical id : 0 +siblings : 2 +core id : 0 +cpu cores : 1 +apicid : 1 +initial apicid : 1 +fpu : yes +fpu_exception : yes +cpuid level : 22 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid tsc_known_freq pni pclmulqdq monitor ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx avx512f avx512dq rdseed adx smap avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves arat avx512_vnni +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit +bogomips : 5000.00 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/proc/self/status new/virt-what-1.25/tests/alibaba-cloud-x86/proc/self/status --- old/virt-what-1.21/tests/alibaba-cloud-x86/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/proc/self/status 2021-05-27 11:53:40.000000000 +0200 @@ -0,0 +1,54 @@ +Name: cat +Umask: 0022 +State: R (running) +Tgid: 25933 +Ngid: 0 +Pid: 25933 +PPid: 25932 +TracerPid: 0 +Uid: 0 0 0 0 +Gid: 0 0 0 0 +FDSize: 64 +Groups: 0 +NStgid: 25933 +NSpid: 25933 +NSpgid: 25932 +NSsid: 25039 +VmPeak: 108084 kB +VmSize: 108084 kB +VmLck: 0 kB +VmPin: 0 kB +VmHWM: 748 kB +VmRSS: 748 kB +RssAnon: 76 kB +RssFile: 672 kB +RssShmem: 0 kB +VmData: 188 kB +VmStk: 132 kB +VmExe: 44 kB +VmLib: 1952 kB +VmPTE: 68 kB +VmSwap: 0 kB +HugetlbPages: 0 kB +CoreDumping: 0 +Threads: 1 +SigQ: 0/30350 +SigPnd: 0000000000000000 +ShdPnd: 0000000000000000 +SigBlk: 0000000000000000 +SigIgn: 0000000000000000 +SigCgt: 0000000000000000 +CapInh: 0000000000000000 +CapPrm: 0000003fffffffff +CapEff: 0000003fffffffff +CapBnd: 0000003fffffffff +CapAmb: 0000000000000000 +NoNewPrivs: 0 +Seccomp: 0 +Speculation_Store_Bypass: vulnerable +Cpus_allowed: 3 +Cpus_allowed_list: 0-1 +Mems_allowed: 00000000,00000001 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 0 +nonvoluntary_ctxt_switches: 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/sbin/dmidecode new/virt-what-1.25/tests/alibaba-cloud-x86/sbin/dmidecode --- old/virt-what-1.21/tests/alibaba-cloud-x86/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/sbin/dmidecode 2021-05-27 11:53:40.000000000 +0200 @@ -0,0 +1,131 @@ +#!/bin/sh - +cat <<'EOF' +# dmidecode 3.2 +Getting SMBIOS data from sysfs. +SMBIOS 2.8 present. +10 structures occupying 462 bytes. +Table at 0x000F5840. + +Handle 0x0000, DMI type 0, 24 bytes +BIOS Information + Vendor: SeaBIOS + Version: 8c24b4c + Release Date: 04/01/2014 + Address: 0xE8000 + Runtime Size: 96 kB + ROM Size: 64 kB + Characteristics: + BIOS characteristics not supported + Targeted content distribution is supported + BIOS Revision: 0.0 + +Handle 0x0100, DMI type 1, 27 bytes +System Information + Manufacturer: Alibaba Cloud + Product Name: Alibaba Cloud ECS + Version: pc-i440fx-2.1 + Serial Number: 20fb1c97-feb0-4c45-b8b9-bb06feeba0b5 + UUID: 20fb1c97-feb0-4c45-b8b9-bb06feeba0b5 + Wake-up Type: Power Switch + SKU Number: Not Specified + Family: Not Specified + +Handle 0x0300, DMI type 3, 21 bytes +Chassis Information + Manufacturer: Alibaba Cloud + Type: Other + Lock: Not Present + Version: pc-i440fx-2.1 + Serial Number: Not Specified + Asset Tag: Not Specified + Boot-up State: Safe + Power Supply State: Safe + Thermal State: Safe + Security Status: Unknown + OEM Information: 0x00000000 + Height: Unspecified + Number Of Power Cords: Unspecified + Contained Elements: 0 + +Handle 0x0400, DMI type 4, 42 bytes +Processor Information + Socket Designation: CPU 0 + Type: Central Processor + Family: Other + Manufacturer: Alibaba Cloud + ID: 57 06 05 00 FF FB 8B 0F + Version: pc-i440fx-2.1 + Voltage: Unknown + External Clock: Unknown + Max Speed: Unknown + Current Speed: Unknown + Status: Populated, Enabled + Upgrade: Other + L1 Cache Handle: Not Provided + L2 Cache Handle: Not Provided + L3 Cache Handle: Not Provided + Serial Number: Not Specified + Asset Tag: Not Specified + Part Number: Not Specified + Core Count: 1 + Core Enabled: 1 + Thread Count: 2 + Characteristics: None + +Handle 0x1000, DMI type 16, 23 bytes +Physical Memory Array + Location: Other + Use: System Memory + Error Correction Type: Multi-bit ECC + Maximum Capacity: 8 GB + Error Information Handle: Not Provided + Number Of Devices: 1 + +Handle 0x1100, DMI type 17, 40 bytes +Memory Device + Array Handle: 0x1000 + Error Information Handle: Not Provided + Total Width: Unknown + Data Width: Unknown + Size: 8192 MB + Form Factor: DIMM + Set: None + Locator: DIMM 0 + Bank Locator: Not Specified + Type: RAM + Type Detail: Other + Speed: Unknown + Manufacturer: Alibaba Cloud + Serial Number: Not Specified + Asset Tag: Not Specified + Part Number: Not Specified + Rank: Unknown + Configured Memory Speed: Unknown + Minimum Voltage: Unknown + Maximum Voltage: Unknown + Configured Voltage: Unknown + +Handle 0x1300, DMI type 19, 31 bytes +Memory Array Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x000BFFFFFFF + Range Size: 3 GB + Physical Array Handle: 0x1000 + Partition Width: 1 + +Handle 0x1301, DMI type 19, 31 bytes +Memory Array Mapped Address + Starting Address: 0x00100000000 + Ending Address: 0x0023FFFFFFF + Range Size: 5 GB + Physical Array Handle: 0x1000 + Partition Width: 1 + +Handle 0x2000, DMI type 32, 11 bytes +System Boot Information + Status: No errors detected + +Handle 0x7F00, DMI type 127, 4 bytes +End Of Table + +EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/sbin/uname new/virt-what-1.25/tests/alibaba-cloud-x86/sbin/uname --- old/virt-what-1.21/tests/alibaba-cloud-x86/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/sbin/uname 2021-05-27 11:53:40.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper new/virt-what-1.25/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper --- old/virt-what-1.21/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/sbin/virt-what-cpuid-helper 2021-05-27 11:53:40.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo KVMKVMKVM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/alibaba-cloud-x86/test.sh new/virt-what-1.25/tests/alibaba-cloud-x86/test.sh --- old/virt-what-1.21/tests/alibaba-cloud-x86/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/alibaba-cloud-x86/test.sh 2021-05-27 11:55:37.000000000 +0200 @@ -0,0 +1,33 @@ +# Test for Alibaba Cloud +# Copyright (C) 2018 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" +expected="alibaba_cloud +kvm" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/aws-kvm-arm/test.sh new/virt-what-1.25/tests/aws-kvm-arm/test.sh --- old/virt-what-1.21/tests/aws-kvm-arm/test.sh 2019-10-03 11:12:22.000000000 +0200 +++ new/virt-what-1.25/tests/aws-kvm-arm/test.sh 2022-08-09 09:50:43.000000000 +0200 @@ -16,9 +16,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -# XXX At the moment KVM cannot be detected on this platform. -# We hope to fix that, but for now the only fact printed is "aws". -expected="aws" +expected="kvm +aws" if [ "$output" != "$expected" ]; then echo "$0: test failed because output did not match expected" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/Makefile.am new/virt-what-1.25/tests/esx-arm/Makefile.am --- old/virt-what-1.21/tests/esx-arm/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/Makefile.am 2021-05-10 22:01:45.000000000 +0200 @@ -0,0 +1,30 @@ +# Makefile for virt-what +# Copyright (C) 2008-2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +CLEANFILES = *~ + +TESTS = test.sh + +EXTRA_DIST = \ + test.sh \ + proc/cpuinfo \ + proc/device-tree/hypervisor/compatible \ + proc/device-tree/hypervisor/name \ + proc/self/status \ + sbin/dmidecode \ + sbin/uname \ + sbin/virt-what-cpuid-helper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/proc/cpuinfo new/virt-what-1.25/tests/esx-arm/proc/cpuinfo --- old/virt-what-1.21/tests/esx-arm/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/proc/cpuinfo 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1,18 @@ +processor : 0 +BogoMIPS : 108.00 +Features : fp asimd evtstrm crc32 cpuid +CPU implementer : 0x41 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0xd08 +CPU revision : 3 + +processor : 1 +BogoMIPS : 108.00 +Features : fp asimd evtstrm crc32 cpuid +CPU implementer : 0x41 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0xd08 +CPU revision : 3 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/proc/device-tree/hypervisor/compatible new/virt-what-1.25/tests/esx-arm/proc/device-tree/hypervisor/compatible --- old/virt-what-1.21/tests/esx-arm/proc/device-tree/hypervisor/compatible 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/proc/device-tree/hypervisor/compatible 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1 @@ +vmware diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/proc/device-tree/hypervisor/name new/virt-what-1.25/tests/esx-arm/proc/device-tree/hypervisor/name --- old/virt-what-1.21/tests/esx-arm/proc/device-tree/hypervisor/name 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/proc/device-tree/hypervisor/name 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1 @@ +hypervisor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/proc/self/status new/virt-what-1.25/tests/esx-arm/proc/self/status --- old/virt-what-1.21/tests/esx-arm/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/proc/self/status 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1,55 @@ +Name: cat +Umask: 0022 +State: R (running) +Tgid: 292937 +Ngid: 0 +Pid: 292937 +PPid: 10956 +TracerPid: 0 +Uid: 0 0 0 0 +Gid: 0 0 0 0 +FDSize: 256 +Groups: 0 +NStgid: 292937 +NSpid: 292937 +NSpgid: 292937 +NSsid: 10956 +VmPeak: 6400 kB +VmSize: 6400 kB +VmLck: 0 kB +VmPin: 0 kB +VmHWM: 960 kB +VmRSS: 960 kB +RssAnon: 448 kB +RssFile: 512 kB +RssShmem: 0 kB +VmData: 640 kB +VmStk: 192 kB +VmExe: 64 kB +VmLib: 1600 kB +VmPTE: 384 kB +VmSwap: 0 kB +HugetlbPages: 0 kB +CoreDumping: 0 +THP_enabled: 1 +Threads: 1 +SigQ: 2/3947 +SigPnd: 0000000000000000 +ShdPnd: 0000000000000000 +SigBlk: 0000000000000000 +SigIgn: 0000000000000000 +SigCgt: 0000000000000000 +CapInh: 0000000000000000 +CapPrm: 0000003fffffffff +CapEff: 0000003fffffffff +CapBnd: 0000003fffffffff +CapAmb: 0000000000000000 +NoNewPrivs: 0 +Seccomp: 0 +Speculation_Store_Bypass: vulnerable +Cpus_allowed: 3 +Cpus_allowed_list: 0-1 +Mems_allowed: 01 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 1 +nonvoluntary_ctxt_switches: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/sbin/dmidecode new/virt-what-1.25/tests/esx-arm/sbin/dmidecode --- old/virt-what-1.21/tests/esx-arm/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/sbin/dmidecode 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/sbin/uname new/virt-what-1.25/tests/esx-arm/sbin/uname --- old/virt-what-1.21/tests/esx-arm/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/sbin/uname 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo aarch64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/sbin/virt-what-cpuid-helper new/virt-what-1.25/tests/esx-arm/sbin/virt-what-cpuid-helper --- old/virt-what-1.21/tests/esx-arm/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/sbin/virt-what-cpuid-helper 2021-05-10 21:56:32.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +# nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/esx-arm/test.sh new/virt-what-1.25/tests/esx-arm/test.sh --- old/virt-what-1.21/tests/esx-arm/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/esx-arm/test.sh 2021-05-10 22:05:17.000000000 +0200 @@ -0,0 +1,32 @@ +# Test for ESXi on ARM +# Copyright (C) 2008-2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" +expected="vmware" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/Makefile.am new/virt-what-1.25/tests/google-cloud/Makefile.am --- old/virt-what-1.21/tests/google-cloud/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/Makefile.am 2022-08-03 19:56:24.000000000 +0200 @@ -0,0 +1,28 @@ +# Makefile for virt-what +# Copyright (C) 2008-2022 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/proc/cpuinfo new/virt-what-1.25/tests/google-cloud/proc/cpuinfo --- old/virt-what-1.21/tests/google-cloud/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/proc/cpuinfo 2022-08-03 19:56:24.000000000 +0200 @@ -0,0 +1,9 @@ +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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/proc/self/status new/virt-what-1.25/tests/google-cloud/proc/self/status --- old/virt-what-1.21/tests/google-cloud/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/proc/self/status 2022-08-03 19:56:24.000000000 +0200 @@ -0,0 +1,57 @@ +Name: cat +Umask: 0022 +State: R (running) +Tgid: 22886 +Ngid: 0 +Pid: 22886 +PPid: 9416 +TracerPid: 0 +Uid: 1002 1002 1002 1002 +Gid: 1003 1003 1003 1003 +FDSize: 256 +Groups: 1003 +NStgid: 22886 +NSpid: 22886 +NSpgid: 22886 +NSsid: 9416 +VmPeak: 5288 kB +VmSize: 5288 kB +VmLck: 0 kB +VmPin: 0 kB +VmHWM: 816 kB +VmRSS: 816 kB +RssAnon: 80 kB +RssFile: 736 kB +RssShmem: 0 kB +VmData: 348 kB +VmStk: 132 kB +VmExe: 24 kB +VmLib: 1728 kB +VmPTE: 56 kB +VmSwap: 0 kB +HugetlbPages: 0 kB +CoreDumping: 0 +THP_enabled: 1 +Threads: 1 +SigQ: 0/13683 +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: unknown +Cpus_allowed: 1 +Cpus_allowed_list: 0 +Mems_allowed: 00000000,00000001 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 0 +nonvoluntary_ctxt_switches: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/sbin/dmidecode new/virt-what-1.25/tests/google-cloud/sbin/dmidecode --- old/virt-what-1.21/tests/google-cloud/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/sbin/dmidecode 2022-08-03 19:56:24.000000000 +0200 @@ -0,0 +1,186 @@ +#!/bin/sh - +cat <<'EOF' +# dmidecode 3.3 +Getting SMBIOS data from sysfs. +SMBIOS 2.4 present. +16 structures occupying 588 bytes. +Table at 0xFFFE0000. + +Handle 0x0000, DMI type 0, 24 bytes +BIOS Information + Vendor: Google + Version: Google + Release Date: 06/20/2022 + Address: 0xE8000 + Runtime Size: 96 kB + ROM Size: 64 kB + Characteristics: + BIOS characteristics not supported + Targeted content distribution is supported + BIOS Revision: 1.0 + +Handle 0x0097, DMI type 1, 27 bytes +System Information + Manufacturer: Google + Product Name: Google Compute Engine + Version: Not Specified + Serial Number: GoogleCloud-957EDC416C53B28F6DA35168B6F8648D + UUID: 957edc41-6c53-b28f-6da3-5168b6f8648d + Wake-up Type: Power Switch + SKU Number: Not Specified + Family: Not Specified + +Handle 0x0098, DMI type 2, 15 bytes +Base Board Information + Manufacturer: KVM + Product Name: Google Compute Engine + Version: Not Specified + Serial Number: Board-GoogleCloud-957EDC416C53B28F6DA35168B6F8648D + Asset Tag: 957EDC41-6C53-B28F-6DA3-5168B6F8648D + Features: + Board is a hosting board + Location In Chassis: Not Specified + Chassis Handle: 0x0099 + Type: Motherboard + Contained Object Handles: 0 + +Handle 0x0099, DMI type 3, 20 bytes +Chassis Information + Manufacturer: Google + Type: Other + Lock: Not Present + Version: Not Specified + Serial Number: Not Specified + Asset Tag: Not Specified + Boot-up State: Safe + Power Supply State: Safe + Thermal State: Safe + Security Status: Unknown + OEM Information: 0x00000000 + Height: Unspecified + Number Of Power Cords: Unspecified + +Handle 0x3001, DMI type 7, 17 bytes +Cache Information + Socket Designation: L1 Cache + Configuration: Disabled, Not Socketed, Level 1 + Operational Mode: Write Through + Location: Internal + Installed Size: 0 kB + Maximum Size: 1 kB + Supported SRAM Types: None + Installed SRAM Type: None + +Handle 0x3002, DMI type 7, 17 bytes +Cache Information + Socket Designation: L2 Cache + Configuration: Disabled, Not Socketed, Level 1 + Operational Mode: Write Back + Location: Internal + Installed Size: 0 kB + Maximum Size: 0 kB + Supported SRAM Types: None + Installed SRAM Type: None + +Handle 0x3003, DMI type 7, 17 bytes +Cache Information + Socket Designation: L3 Cache + Configuration: Disabled, Not Socketed, Level 1 + Operational Mode: Varies With Memory Address + Location: Internal + Installed Size: 256 kB + Maximum Size: 256 kB + Supported SRAM Types: None + Installed SRAM Type: None + +Handle 0x1000, DMI type 4, 42 bytes +Processor Information + Socket Designation: CPU 1 + Type: Central Processor + Family: ARMv8 + Manufacturer: Google + ID: 00 00 00 00 00 00 00 00 + Version: Not Specified + Voltage: Unknown + External Clock: Unknown + Max Speed: 3000 MHz + Current Speed: 3000 MHz + Status: Populated, Enabled + Upgrade: Other + L1 Cache Handle: 0x3001 + L2 Cache Handle: 0x3002 + L3 Cache Handle: 0x3003 + Serial Number: Not Specified + Asset Tag: Not Specified + Part Number: Not Specified + Core Count: 1 + Core Enabled: 1 + Thread Count: 1 + Characteristics: + 64-bit capable + +Handle 0x0200, DMI type 16, 15 bytes +Physical Memory Array + Location: Other + Use: System Memory + Error Correction Type: Multi-bit ECC + Maximum Capacity: 4 GB + Error Information Handle: Not Provided + Number Of Devices: 1 + +Handle 0x7000, DMI type 17, 21 bytes +Memory Device + Array Handle: 0x0200 + Error Information Handle: Not Provided + Total Width: 64 bits + Data Width: 64 bits + Size: 4 GB + Form Factor: DIMM + Set: None + Locator: DIMM 0 + Bank Locator: Not Specified + Type: RAM + Type Detail: Synchronous + +Handle 0x0300, DMI type 19, 15 bytes +Memory Array Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x000BFFFFFFF + Range Size: 3 GB + Physical Array Handle: 0x0200 + Partition Width: 1 + +Handle 0x0301, DMI type 19, 15 bytes +Memory Array Mapped Address + Starting Address: 0x00100000000 + Ending Address: 0x0013FFFFFFF + Range Size: 1 GB + Physical Array Handle: 0x0200 + Partition Width: 1 + +Handle 0x4000, DMI type 20, 19 bytes +Memory Device Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x000BFFFFFFF + Range Size: 3 GB + Physical Device Handle: 0x7000 + Memory Array Mapped Address Handle: 0x0300 + Partition Row Position: 1 + +Handle 0x4001, DMI type 20, 19 bytes +Memory Device Mapped Address + Starting Address: 0x00100000000 + Ending Address: 0x0013FFFFFFF + Range Size: 1 GB + Physical Device Handle: 0x7000 + Memory Array Mapped Address Handle: 0x0301 + Partition Row Position: 1 + +Handle 0x0100, DMI type 32, 11 bytes +System Boot Information + Status: No errors detected + +Handle 0xFEFF, DMI type 127, 4 bytes +End Of Table + +EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/sbin/uname new/virt-what-1.25/tests/google-cloud/sbin/uname --- old/virt-what-1.21/tests/google-cloud/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/sbin/uname 2022-08-03 19:56:24.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo aarch64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/sbin/virt-what-cpuid-helper new/virt-what-1.25/tests/google-cloud/sbin/virt-what-cpuid-helper --- old/virt-what-1.21/tests/google-cloud/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/sbin/virt-what-cpuid-helper 2022-08-03 19:56:24.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/google-cloud/test.sh new/virt-what-1.25/tests/google-cloud/test.sh --- old/virt-what-1.21/tests/google-cloud/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/google-cloud/test.sh 2022-08-08 18:18:55.000000000 +0200 @@ -0,0 +1,33 @@ +# Test for GCE +# Copyright (C) 2008-2022 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="google_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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/illumos-lx/Makefile.am new/virt-what-1.25/tests/illumos-lx/Makefile.am --- old/virt-what-1.21/tests/illumos-lx/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/illumos-lx/Makefile.am 2022-08-03 19:27:53.000000000 +0200 @@ -0,0 +1,28 @@ +# Makefile for virt-what +# Copyright (C) 2022 Steve Mokris +# +# 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/version \ + sbin/dmidecode \ + sbin/uname \ + sbin/virt-what-cpuid-helper Binary files old/virt-what-1.21/tests/illumos-lx/proc/1/environ and new/virt-what-1.25/tests/illumos-lx/proc/1/environ differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/illumos-lx/proc/version new/virt-what-1.25/tests/illumos-lx/proc/version --- old/virt-what-1.21/tests/illumos-lx/proc/version 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/illumos-lx/proc/version 2022-05-12 18:20:41.000000000 +0200 @@ -0,0 +1 @@ +Linux version 3.16.0 (gcc version 7.5.0) BrandZ virtual linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/illumos-lx/sbin/dmidecode new/virt-what-1.25/tests/illumos-lx/sbin/dmidecode --- old/virt-what-1.21/tests/illumos-lx/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/illumos-lx/sbin/dmidecode 2022-08-03 19:27:53.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/sh - +cat <<'EOF' +# dmidecode 2.11 +/dev/mem: Operation not permitted +EOF +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/illumos-lx/sbin/uname new/virt-what-1.25/tests/illumos-lx/sbin/uname --- old/virt-what-1.21/tests/illumos-lx/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/illumos-lx/sbin/uname 2022-08-03 19:27:53.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/illumos-lx/sbin/virt-what-cpuid-helper new/virt-what-1.25/tests/illumos-lx/sbin/virt-what-cpuid-helper --- old/virt-what-1.21/tests/illumos-lx/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/illumos-lx/sbin/virt-what-cpuid-helper 2022-08-03 19:27:53.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo @ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/illumos-lx/test.sh new/virt-what-1.25/tests/illumos-lx/test.sh --- old/virt-what-1.21/tests/illumos-lx/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.25/tests/illumos-lx/test.sh 2022-05-12 18:20:41.000000000 +0200 @@ -0,0 +1,32 @@ +# Test for illumos-lx +# Copyright (C) 2022 Steve Mokris +# +# 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="illumos-lx" + +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/nutanix-ahv/test.sh new/virt-what-1.25/tests/nutanix-ahv/test.sh --- old/virt-what-1.21/tests/nutanix-ahv/test.sh 2019-10-04 15:32:04.000000000 +0200 +++ new/virt-what-1.25/tests/nutanix-ahv/test.sh 2021-07-22 09:59:04.000000000 +0200 @@ -16,7 +16,9 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -expected="nutanix_ahv" +expected="nutanix_ahv +redhat +kvm" if [ "$output" != "$expected" ]; then echo "$0: test failed because output did not match expected" Binary files old/virt-what-1.21/tests/podman/1/environ and new/virt-what-1.25/tests/podman/1/environ differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/podman/Makefile.am new/virt-what-1.25/tests/podman/Makefile.am --- old/virt-what-1.21/tests/podman/Makefile.am 2020-07-07 17:02:50.000000000 +0200 +++ new/virt-what-1.25/tests/podman/Makefile.am 2022-04-14 14:50:31.000000000 +0200 @@ -20,6 +20,7 @@ TESTS = test.sh EXTRA_DIST = \ + 1/environ \ test.sh \ proc/cpuinfo \ proc/self/cgroup \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/rhel5-xen-domU-hvm/test.sh new/virt-what-1.25/tests/rhel5-xen-domU-hvm/test.sh --- old/virt-what-1.21/tests/rhel5-xen-domU-hvm/test.sh 2019-10-03 11:12:22.000000000 +0200 +++ new/virt-what-1.25/tests/rhel5-xen-domU-hvm/test.sh 2021-07-19 19:09:10.000000000 +0200 @@ -16,7 +16,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" -expected="xen +expected="redhat +xen xen-hvm" if [ "$output" != "$expected" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/tests/rhev/test.sh new/virt-what-1.25/tests/rhev/test.sh --- old/virt-what-1.21/tests/rhev/test.sh 2019-10-03 11:12:22.000000000 +0200 +++ new/virt-what-1.25/tests/rhev/test.sh 2021-07-19 19:09:37.000000000 +0200 @@ -17,6 +17,7 @@ output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" expected="rhev +redhat kvm" if [ "$output" != "$expected" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/virt-what.in new/virt-what-1.25/virt-what.in --- old/virt-what-1.21/virt-what.in 2020-07-07 17:02:50.000000000 +0200 +++ new/virt-what-1.25/virt-what.in 2022-08-09 09:54:55.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh - # @configure_input@ -# Copyright (C) 2008-2019 Red Hat Inc. +# Copyright (C) 2008-2022 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 @@ -113,6 +113,16 @@ arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') +# Check for Alibaba Cloud +if echo "$dmi" | grep -q 'Manufacturer: Alibaba'; then + # Check for Alibaba Cloud ECS Bare Metal (EBM) Instance + if [ "x$root" = "x" ] && ( { echo -e "GET /latest/meta-datainstance/instance-type HTTP/1.0\r\nHost: 100.100.100.200\r\n\r" >&3; grep -sq 'ebm' <&3 ; } 3<> /dev/tcp/100.100.100.200/80 ) 2>/dev/null ; then + echo "alibaba_cloud-ebm" + else + echo "alibaba_cloud" + fi +fi + # Check for VMware. # cpuid check added by Chetan Loke. @@ -169,6 +179,13 @@ echo lxc fi +if [ -e "${root}/proc/1/environ" ] && + tr '\0' '\n' < "${root}/proc/1/environ" | grep -q '^container=zone$' && + [ -e "${root}/proc/version" ] && + grep -q 'BrandZ virtual linux' < "${root}/proc/version"; then + echo illumos-lx +fi + # Check for Linux-VServer if test -e "${root}/proc/self/status" \ && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then @@ -222,11 +239,8 @@ fi # Check for Nutanix AHV. -# This is sufficiently different from KVM and has Viridian extensions, -# so skip the KVM test. if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then echo nutanix_ahv - skip_qemu_kvm=true fi # Check for oVirt/RHEV. @@ -237,6 +251,16 @@ echo rhev fi +# Google Cloud +if echo "$dmi" | grep -q 'Product Name: Google Compute Engine'; then + echo google_cloud +fi + +# Red Hat's hypervisor. +if echo "$dmi" | grep -q 'Manufacturer: Red Hat'; then + echo redhat +fi + # Check for Xen. if [ "$cpuid" = "XenVMMXenVMM" ] && @@ -264,6 +288,10 @@ echo xen skip_qemu_kvm=true skip_lkvm=true + elif [ -d "${root}/proc/device-tree/hypervisor" ] && + grep -q "vmware" "${root}/proc/device-tree/hypervisor/compatible"; then + echo vmware + skip_lkvm=true fi elif [ "$arch" = "ia64" ]; then if [ -d "${root}/sys/bus/xen" -a ! -d "${root}/sys/bus/xen-backend" ]; then @@ -298,6 +326,14 @@ elif echo "$dmi" | grep -q 'Product Name: KVM'; then echo kvm skip_lkvm=true + elif echo "$dmi" | grep -q 'Manufacturer: KVM'; then + echo kvm + skip_lkvm=true + elif echo "$dmi" | grep -q 'Manufacturer: Amazon EC2' && + echo "$dmi" | grep -q 'System is a virtual machine'; then + # This is for AWS Graviton (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. @@ -409,7 +445,7 @@ # Check for AWS. # AWS on Xen. -if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then +if echo "$dmi" | grep -Eq 'Version: [0-9]+\.[0-9]+\.amazon'; then echo aws # AWS on baremetal or KVM. elif echo "$dmi" | grep -q 'Vendor: Amazon EC2'; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.21/virt-what.pod new/virt-what-1.25/virt-what.pod --- old/virt-what-1.21/virt-what.pod 2020-07-07 17:02:50.000000000 +0200 +++ new/virt-what-1.25/virt-what.pod 2022-08-03 19:56:24.000000000 +0200 @@ -25,6 +25,14 @@ =over 4 +=item B<alibaba_cloud> + +=item B<alibaba_cloud-ebm> + +This is a cloud computing service based on Alibaba Cloud. + +Status: contributed by Weisson. + =item B<aws> Amazon Web Services. @@ -47,6 +55,12 @@ Status: confirmed by Charles Nguyen +=item B<google_cloud> + +This is running on Google Cloud Platform / Google Compute Engine. + +Status: confirmed by RWMJ + =item B<hyperv> This is Microsoft Hyper-V hypervisor. @@ -103,6 +117,12 @@ Status: contributed by Thomas Huth +=item B<illumos-lx> + +The guest is running on Illumos with a Linux syscall emulation layer. + +Status: contributed by Steve Mokris + =item B<ldoms> The guest appears to be running on an Linux SPARC system with @@ -232,6 +252,12 @@ Status: confirmed by RWMJ +=item B<redhat> + +The guest is running on the Red Hat hypervisor. + +Status: confirmed by RWMJ + =item B<uml> This is a User-Mode Linux (UML) guest. @@ -385,7 +411,7 @@ =head1 COPYRIGHT -(C) Copyright 2008-2015 Red Hat Inc., +(C) Copyright 2008-2022 Red Hat Inc., L<http://people.redhat.com/~rjones/virt-what/> This program is free software; you can redistribute it and/or modify
