Looking at "$dmi" on targets that don't support dmidecode is
harmless. Furthermore it works, not only for arm targets, but
also pc, so move it out of the 'if arm' block.
(cherry picked from commit
6dbd668e3523d85aeedf16c6cdcc7648508a035e)
tests/test-parallels-desktop.sh \
tests/test-qemu.sh \
tests/test-qemu-arm.sh \
tests/test-parallels-desktop.sh \
tests/test-qemu.sh \
tests/test-qemu-arm.sh \
- tests/test-qemu-arm-acpi.sh \
+ tests/test-qemu-smbios.sh \
tests/test-rhel5-xen-dom0.sh \
tests/test-rhel5-xen-domU-hvm.sh \
tests/test-rhel5-xen-domU-hvm-ia64.sh \
tests/test-rhel5-xen-dom0.sh \
tests/test-rhel5-xen-domU-hvm.sh \
tests/test-rhel5-xen-domU-hvm-ia64.sh \
tests/qemu-arm/sbin/dmidecode \
tests/qemu-arm/sbin/uname \
tests/qemu-arm/sbin/virt-what-cpuid-helper \
tests/qemu-arm/sbin/dmidecode \
tests/qemu-arm/sbin/uname \
tests/qemu-arm/sbin/virt-what-cpuid-helper \
- tests/qemu-arm-acpi/proc/cpuinfo \
- tests/qemu-arm-acpi/proc/self/status \
- tests/qemu-arm-acpi/sbin/dmidecode \
- tests/qemu-arm-acpi/sbin/uname \
- tests/qemu-arm-acpi/sbin/virt-what-cpuid-helper \
+ tests/qemu-smbios/proc/cpuinfo \
+ tests/qemu-smbios/proc/self/status \
+ tests/qemu-smbios/sbin/dmidecode \
+ tests/qemu-smbios/sbin/uname \
+ tests/qemu-smbios/sbin/virt-what-cpuid-helper \
tests/rhel5-xen-dom0/proc/cpuinfo \
tests/rhel5-xen-dom0/proc/self/status \
tests/rhel5-xen-dom0/proc/xen/balloon \
tests/rhel5-xen-dom0/proc/cpuinfo \
tests/rhel5-xen-dom0/proc/self/status \
tests/rhel5-xen-dom0/proc/xen/balloon \
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-root=tests/qemu-arm-acpi
output="$(./virt-what --test-root=$root 2>&1)"
expected="qemu"
output="$(./virt-what --test-root=$root 2>&1)"
expected="qemu"
if ! "$skip_qemu_kvm"; then
if [ "$cpuid" = "KVMKVMKVM" ]; then
echo kvm
if ! "$skip_qemu_kvm"; then
if [ "$cpuid" = "KVMKVMKVM" ]; then
echo kvm
+ elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
+ # We don't have enough information to determine if we're
+ # using KVM acceleration or not.
+ echo qemu
+ skip_lkvm=true
elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then
if [ -d "${root}/proc/device-tree" ] &&
ls "${root}/proc/device-tree" | grep -q "fw-cfg"; then
elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then
if [ -d "${root}/proc/device-tree" ] &&
ls "${root}/proc/device-tree" | grep -q "fw-cfg"; then
# using KVM acceleration or not.
echo qemu
skip_lkvm=true
# using KVM acceleration or not.
echo qemu
skip_lkvm=true
- elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
- # We don't have enough information to determine if we're
- # using KVM acceleration or not.
- echo qemu
- skip_lkvm=true
fi
else
# XXX This is known to fail for qemu with the explicit -cpu
fi
else
# XXX This is known to fail for qemu with the explicit -cpu