git.annexia.org
/
virt-what.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to detect QEMU via 'TCGTCGTCGTCG' CPUID
[virt-what.git]
/
virt-what.in
diff --git
a/virt-what.in
b/virt-what.in
index
64ab770
..
5f9edd7
100644
(file)
--- a/
virt-what.in
+++ b/
virt-what.in
@@
-194,7
+194,9
@@
fi
if have_cpuinfo && grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then
echo ibm_systemz
if [ -f "${root}/proc/sysinfo" ]; then
if have_cpuinfo && grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then
echo ibm_systemz
if [ -f "${root}/proc/sysinfo" ]; then
- if grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then
+ if grep -q 'VM.*Control Program.*KVM/Linux' "${root}/proc/sysinfo"; then
+ echo ibm_systemz-kvm
+ elif grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then
echo ibm_systemz-zvm
elif grep -q '^LPAR' "${root}/proc/sysinfo"; then
echo ibm_systemz-lpar
echo ibm_systemz-zvm
elif grep -q '^LPAR' "${root}/proc/sysinfo"; then
echo ibm_systemz-lpar
@@
-273,6
+275,9
@@
fi
if ! "$skip_qemu_kvm"; then
if [ "$cpuid" = "KVMKVMKVM" ]; then
echo kvm
if ! "$skip_qemu_kvm"; then
if [ "$cpuid" = "KVMKVMKVM" ]; then
echo kvm
+ elif [ "$cpuid" = "TCGTCGTCGTCG" ]; then
+ echo qemu
+ skip_lkvm=true
elif echo "$dmi" | grep -q 'Product Name: KVM'; then
echo kvm
skip_lkvm=true
elif echo "$dmi" | grep -q 'Product Name: KVM'; then
echo kvm
skip_lkvm=true
@@
-295,10
+300,10
@@
if ! "$skip_qemu_kvm"; then
echo kvm
skip_lkvm=true
else
echo kvm
skip_lkvm=true
else
- #
XXX
This is known to fail for qemu with the explicit -cpu
+ # This is known to fail for qemu with the explicit -cpu
# option, since /proc/cpuinfo will not contain the QEMU
# option, since /proc/cpuinfo will not contain the QEMU
- # string.
The long term fix for this would be to export
- #
another CPUID leaf for non-accelerated qemu.
+ # string.
QEMU 2.10 added a new CPUID leaf, so this
+ #
problem only triggered for older QEMU
if grep -q 'QEMU' "${root}/proc/cpuinfo"; then
echo qemu
fi
if grep -q 'QEMU' "${root}/proc/cpuinfo"; then
echo qemu
fi