chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8f1df8
)
ARM: detect-virt: detect Xen
author
Andrew Jones
<drjones@redhat.com>
Tue, 31 Mar 2015 09:08:12 +0000
(11:08 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 31 Mar 2015 13:36:53 +0000
(15:36 +0200)
src/shared/virt.c
patch
|
blob
|
history
diff --git
a/src/shared/virt.c
b/src/shared/virt.c
index aa3501f42916c70e2137124a20d59ef5dca66aed..712523210d7202d6d755bfb8e8591217989c04c2 100644
(file)
--- 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) {
}
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;
_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;
if (streq(hvtype, "linux,kvm")) {
*_id = "kvm";
return 1;
+ } else if (strstr(hvtype, "xen")) {
+ *_id = "xen";
+ return 1;
}
}
#endif
}
}
#endif