From: Andrew Jones <drjones@redhat.com>
Date: Tue, 31 Mar 2015 09:08:12 +0000 (+0200)
Subject: ARM: detect-virt: detect Xen
X-Git-Tag: v219.0~217
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=db6a86897efb337100165c017da81cc70fac51e2;p=elogind.git

ARM: detect-virt: detect Xen
---

diff --git a/src/shared/virt.c b/src/shared/virt.c
index aa3501f42..712523210 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -102,7 +102,7 @@ static int detect_vm_cpuid(const char **_id) {
 }
 
 static int detect_vm_devicetree(const char **_id) {
-#if defined(__powerpc__) || defined(__powerpc64__)
+#if defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(__powerpc64__)
         _cleanup_free_ char *hvtype = NULL;
         int r;
 
@@ -111,6 +111,9 @@ static int detect_vm_devicetree(const char **_id) {
                 if (streq(hvtype, "linux,kvm")) {
                         *_id = "kvm";
                         return 1;
+                } else if (strstr(hvtype, "xen")) {
+                        *_id = "xen";
+                        return 1;
                 }
         }
 #endif