From: Richard W.M. Jones Date: Tue, 18 Jan 2011 17:36:30 +0000 (+0000) Subject: Add tests for KVM and QEMU. X-Git-Tag: 1.5~2 X-Git-Url: http://git.annexia.org/?p=virt-what.git;a=commitdiff_plain;h=45623caae6166fe7d0ce7ef396b9b58795bcfe6d Add tests for KVM and QEMU. The data is taken from a RHEL 6.0 guest running on a Fedora 14 host (x86_64 in both cases), using qemu-kvm and qemu-system-x86_64 respectively. qemu-kvm-0.13.0-1.fc14.x86_64 qemu-system-x86-0.13.0-1.fc14.x86_64 --- diff --git a/Makefile.am b/Makefile.am index 7ebe9b2..f065cc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,9 +35,9 @@ virt-what.txt: virt-what.pod TESTS = \ tests/test-baremetal.sh \ - tests/test-esx4.1.sh -# tests/test-kvm.sh \ -# tests/test-qemu.sh \ + tests/test-esx4.1.sh \ + tests/test-kvm.sh \ + tests/test-qemu.sh # tests/test-virtualbox.sh \ # tests/test-xen-dom0.sh \ # tests/test-xen-domU.sh diff --git a/tests/kvm/proc/cpuinfo b/tests/kvm/proc/cpuinfo new file mode 100644 index 0000000..212a7ff --- /dev/null +++ b/tests/kvm/proc/cpuinfo @@ -0,0 +1,19 @@ +processor : 0 +vendor_id : GenuineIntel +cpu family : 6 +model : 2 +model name : QEMU Virtual CPU version 0.13.0 +stepping : 3 +cpu MHz : 2660.156 +cache size : 4096 KB +fpu : yes +fpu_exception : yes +cpuid level : 4 +wp : yes +flags : fpu de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up rep_good unfair_spinlock pni cx16 popcnt hypervisor lahf_lm +bogomips : 5320.31 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + diff --git a/tests/kvm/sbin/dmidecode b/tests/kvm/sbin/dmidecode new file mode 100755 index 0000000..fd8b76e --- /dev/null +++ b/tests/kvm/sbin/dmidecode @@ -0,0 +1,113 @@ +#!/bin/sh - +cat <<'EOF' +# dmidecode 2.10 +SMBIOS 2.4 present. +10 structures occupying 263 bytes. +Table at 0x3FFFFEF0. + +Handle 0x0000, DMI type 0, 24 bytes +BIOS Information + Vendor: Bochs + Version: Bochs + Release Date: 01/01/2007 + 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 0x0100, DMI type 1, 27 bytes +System Information + Manufacturer: Bochs + Product Name: Bochs + Version: Not Specified + Serial Number: Not Specified + UUID: 7061F170-D1CF-6F48-6770-984E8D171011 + Wake-up Type: Power Switch + SKU Number: Not Specified + Family: Not Specified + +Handle 0x0300, DMI type 3, 20 bytes +Chassis Information + Manufacturer: Bochs + 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 0x0401, DMI type 4, 32 bytes +Processor Information + Socket Designation: CPU01 + Type: Central Processor + Family: Other + Manufacturer: Bochs + ID: 23 06 00 00 FD FB 8B 07 + Version: Not Specified + Voltage: Unknown + External Clock: Unknown + Max Speed: 2000 MHz + Current Speed: 2000 MHz + Status: Populated, Enabled + Upgrade: Other + L1 Cache Handle: Not Provided + L2 Cache Handle: Not Provided + L3 Cache Handle: Not Provided + +Handle 0x1000, DMI type 16, 15 bytes +Physical Memory Array + Location: Other + Use: System Memory + Error Correction Type: Multi-bit ECC + Maximum Capacity: 1 GB + Error Information Handle: Not Provided + Number Of Devices: 1 + +Handle 0x1100, DMI type 17, 21 bytes +Memory Device + Array Handle: 0x1000 + Error Information Handle: 0x0000 + Total Width: 64 bits + Data Width: 64 bits + Size: 1024 MB + Form Factor: DIMM + Set: None + Locator: DIMM 0 + Bank Locator: Not Specified + Type: RAM + Type Detail: None + +Handle 0x1300, DMI type 19, 15 bytes +Memory Array Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x0003FFFFFFF + Range Size: 1 GB + Physical Array Handle: 0x1000 + Partition Width: 0 + +Handle 0x1400, DMI type 20, 19 bytes +Memory Device Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x0003FFFFFFF + Range Size: 1 GB + Physical Device Handle: 0x1100 + Memory Array Mapped Address Handle: 0x1300 + Partition Row Position: 1 + +Handle 0x2000, DMI type 32, 11 bytes +System Boot Information + Status: No errors detected + +Handle 0x7F00, DMI type 127, 4 bytes +End Of Table + +EOF diff --git a/tests/kvm/sbin/id b/tests/kvm/sbin/id new file mode 100755 index 0000000..6c704ac --- /dev/null +++ b/tests/kvm/sbin/id @@ -0,0 +1,2 @@ +#!/bin/sh - +echo 0 diff --git a/tests/kvm/sbin/virt-what-cpuid-helper b/tests/kvm/sbin/virt-what-cpuid-helper new file mode 100755 index 0000000..f52a9d7 --- /dev/null +++ b/tests/kvm/sbin/virt-what-cpuid-helper @@ -0,0 +1,2 @@ +#!/bin/sh - +echo KVMKVMKVM diff --git a/tests/qemu/proc/cpuinfo b/tests/qemu/proc/cpuinfo new file mode 100644 index 0000000..db955d9 --- /dev/null +++ b/tests/qemu/proc/cpuinfo @@ -0,0 +1,20 @@ +processor : 0 +vendor_id : AuthenticAMD +cpu family : 6 +model : 2 +model name : QEMU Virtual CPU version 0.13.0 +stepping : 3 +cpu MHz : 2659.401 +cache size : 512 KB +fpu : yes +fpu_exception : yes +cpuid level : 4 +wp : yes +flags : fpu pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx lm up unfair_spinlock pni cx16 popcnt hypervisor lahf_lm svm abm sse4a +bogomips : 5318.80 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + diff --git a/tests/qemu/sbin/dmidecode b/tests/qemu/sbin/dmidecode new file mode 100755 index 0000000..c1c2fcb --- /dev/null +++ b/tests/qemu/sbin/dmidecode @@ -0,0 +1,113 @@ +#!/bin/sh - +cat <<'EOF' +# dmidecode 2.10 +SMBIOS 2.4 present. +10 structures occupying 263 bytes. +Table at 0x3FFFFEF0. + +Handle 0x0000, DMI type 0, 24 bytes +BIOS Information + Vendor: Bochs + Version: Bochs + Release Date: 01/01/2007 + 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 0x0100, DMI type 1, 27 bytes +System Information + Manufacturer: Bochs + Product Name: Bochs + Version: Not Specified + Serial Number: Not Specified + UUID: 7061F170-D1CF-6F48-6770-984E8D171011 + Wake-up Type: Power Switch + SKU Number: Not Specified + Family: Not Specified + +Handle 0x0300, DMI type 3, 20 bytes +Chassis Information + Manufacturer: Bochs + 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 0x0401, DMI type 4, 32 bytes +Processor Information + Socket Designation: CPU01 + Type: Central Processor + Family: Other + Manufacturer: Bochs + ID: 23 06 00 00 F9 FB 8B 07 + Version: Not Specified + Voltage: Unknown + External Clock: Unknown + Max Speed: 2000 MHz + Current Speed: 2000 MHz + Status: Populated, Enabled + Upgrade: Other + L1 Cache Handle: Not Provided + L2 Cache Handle: Not Provided + L3 Cache Handle: Not Provided + +Handle 0x1000, DMI type 16, 15 bytes +Physical Memory Array + Location: Other + Use: System Memory + Error Correction Type: Multi-bit ECC + Maximum Capacity: 1 GB + Error Information Handle: Not Provided + Number Of Devices: 1 + +Handle 0x1100, DMI type 17, 21 bytes +Memory Device + Array Handle: 0x1000 + Error Information Handle: 0x0000 + Total Width: 64 bits + Data Width: 64 bits + Size: 1024 MB + Form Factor: DIMM + Set: None + Locator: DIMM 0 + Bank Locator: Not Specified + Type: RAM + Type Detail: None + +Handle 0x1300, DMI type 19, 15 bytes +Memory Array Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x0003FFFFFFF + Range Size: 1 GB + Physical Array Handle: 0x1000 + Partition Width: 0 + +Handle 0x1400, DMI type 20, 19 bytes +Memory Device Mapped Address + Starting Address: 0x00000000000 + Ending Address: 0x0003FFFFFFF + Range Size: 1 GB + Physical Device Handle: 0x1100 + Memory Array Mapped Address Handle: 0x1300 + Partition Row Position: 1 + +Handle 0x2000, DMI type 32, 11 bytes +System Boot Information + Status: No errors detected + +Handle 0x7F00, DMI type 127, 4 bytes +End Of Table + +EOF diff --git a/tests/qemu/sbin/id b/tests/qemu/sbin/id new file mode 100755 index 0000000..6c704ac --- /dev/null +++ b/tests/qemu/sbin/id @@ -0,0 +1,2 @@ +#!/bin/sh - +echo 0 diff --git a/tests/qemu/sbin/virt-what-cpuid-helper b/tests/qemu/sbin/virt-what-cpuid-helper new file mode 100755 index 0000000..ac69534 --- /dev/null +++ b/tests/qemu/sbin/virt-what-cpuid-helper @@ -0,0 +1,4 @@ +#!/bin/sh - +# For reasons that are genuinely unknown, virt-what-cpuid-helper +# in a qemu guest prints out a '?' character. +echo '?' diff --git a/tests/test-kvm.sh b/tests/test-kvm.sh new file mode 100755 index 0000000..035e244 --- /dev/null +++ b/tests/test-kvm.sh @@ -0,0 +1,34 @@ +# Test for KVM +# 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. + +root=tests/kvm + +output="$(./virt-what --test-root=$root 2>&1)" +expected="kvm" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff --git a/tests/test-qemu.sh b/tests/test-qemu.sh new file mode 100755 index 0000000..284fe41 --- /dev/null +++ b/tests/test-qemu.sh @@ -0,0 +1,34 @@ +# Test for qemu +# 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. + +root=tests/qemu + +output="$(./virt-what --test-root=$root 2>&1)" +expected="qemu" + +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