Detect Microsoft Hyper-V.

[virt-what.git] / virt-what.in

diff --git a/virt-what.in b/virt-what.in
index 313cd06..46bf12d 100644 (file)
--- a/virt-what.in
+++ b/virt-what.in
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # @configure_input@
-# Copyright (C) 2008-2009 Red Hat Inc.
+# Copyright (C) 2008-2010 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
@@ -88,6 +88,12 @@ elif echo "$dmi" | grep -q 'Manufacturer: VMware'; then
     echo vmware
 fi
 
+# Check for Hyper-V.
+# http://blogs.msdn.com/b/sqlosteam/archive/2010/10/30/is-this-real-the-metaphysics-of-hardware-virtualization.aspx
+if [ "$cpuid" = "Microsoft Hv" ]; then
+    echo hyperv
+fi
+
 # Check for VirtualPC.
 
 if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
@@ -121,11 +127,13 @@ fi
 if [ "$cpuid" = "XenVMMXenVMM" ]; then
     echo xen; echo xen-hvm
     is_xen=1
-elif [ -f /proc/xen/privcmd ]; then
-    echo xen; echo xen-dom0
-    is_xen=1
 elif [ -f /proc/xen/capabilities ]; then
-    echo xen; echo xen-domU
+    echo xen
+    if grep -q "control_d" /proc/xen/capabilities; then
+        echo xen-dom0
+    else
+        echo xen-domU
+    fi
     is_xen=1
 elif [ -d /proc/xen ]; then
     # This directory can be present when Xen paravirt drivers are