summaryrefslogtreecommitdiffstats
path: root/virt-what.in
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-01-26 23:39:40 +0000
committerRichard W.M. Jones <rjones@redhat.com>2011-01-26 23:43:00 +0000
commit0e90af4014da8065a4062319921288baf972c6fb (patch)
tree2802993265c308f0d6eb3cd9aa7d968c46f1ada8 /virt-what.in
parent80499c7119791248ff9ffc20f575be13fbc83534 (diff)
downloadvirt-what-0e90af4014da8065a4062319921288baf972c6fb.tar.gz
virt-what-0e90af4014da8065a4062319921288baf972c6fb.tar.xz
virt-what-0e90af4014da8065a4062319921288baf972c6fb.zip
Confirm Microsoft Hyper-V, and add a regression test.
Data collected from a RHEL 5.6 guest running on Hyper-V. Also this modifies the VirtualPC test slightly to distinguish it from Hyper-V. We require more data from a real VirtualPC guest to properly refine this test.
Diffstat (limited to 'virt-what.in')
-rw-r--r--virt-what.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/virt-what.in b/virt-what.in
index a0f7406..870c09b 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -100,8 +100,10 @@ if [ "$cpuid" = "Microsoft Hv" ]; then
fi
# Check for VirtualPC.
-
-if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
+# The negative check for cpuid is to distinguish this from Hyper-V
+# which also has the same manufacturer string in the SM-BIOS data.
+if [ "$cpuid" != "Microsoft Hv" ] &&
+ echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
echo virtualpc
fi