Commit 2d4aa5ed authored by ssrq's avatar ssrq

[explorer/machine_type] Remove skip_* variables

parent 0b1cb663
Pipeline #4000 passed with stage
in 2 minutes and 29 seconds
......@@ -320,9 +320,7 @@ check_arch_specific() {
echo virtual by kvm
;;
('TCGTCGTCGTCG')
# echo qemu
echo virtual by qemu-tcg
# skip_lkvm=true
;;
('Microsoft Hv')
# http://blogs.msdn.com/b/sqlosteam/archive/2010/10/30/is-this-real-the-metaphysics-of-hardware-virtualization.aspx
......@@ -340,9 +338,7 @@ check_arch_specific() {
if has dmi
then
# https://access.redhat.com/solutions/222903
# echo xen
echo virtual by xen-hvm
# skip_qemu_kvm=true
else
echo virtual by xen-paravirt
fi
......@@ -356,7 +352,6 @@ check_arch_specific() {
if test -d /sys/bus/xen -a ! -d /sys/bus/xen-backend
then
# PV-on-HVM drivers installed in a Xen guest
# echo xen
echo xen-hvm
fi
;;
......@@ -496,9 +491,6 @@ check_hyp_specific() {
# echo xen-domU
echo virtual by xen
fi
skip_qemu_kvm=true
skip_lkvm=true
fi
}
......@@ -515,15 +507,12 @@ check_dt() {
&& grep -qF 'xen' /proc/device-tree/hypervisor/compatible
then
echo virtual by xen
skip_qemu_kvm=true
skip_lkvm=true
elif glob_exists /proc/device-tree/*fw-cfg*
then
# We don't have enough information to determine if we're
# using KVM acceleration or not.
echo virtual by qemu
skip_lkvm=true
elif ! ${skip_lkvm:-false} && grep -qF 'dummy-virt' /proc/device-tree/compatible
elif grep -qF 'dummy-virt' /proc/device-tree/compatible
then
# XXX: what is lkvm?
echo virtual by lkvm
......@@ -535,7 +524,6 @@ check_dt() {
then
# We are running as a spapr KVM guest on ppc64
echo virtual by kvm-spapr
skip_lkvm=true
fi
;;
esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment