From aa734a5bff82b36d0b085d3fa87ba0a04a0b73b0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 18 Oct 2010 20:02:21 +0100
Subject: [PATCH] xen: More reliable differentiation of dom0 and domU.

---
 virt-what.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/virt-what.in b/virt-what.in
index 313cd06..375822e 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -121,11 +121,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
-- 
1.8.3.1