X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fvirt.c;h=7c1381f4b81147134062afe66059708da0bf3978;hb=33c2ce7b200747c172d4899c717a8e9097d84659;hp=f10baab40bc0ccbc0620930e467f0ffc6d4908b4;hpb=536bfdab4cca38916ec8b112a6f80b0c068cc806;p=elogind.git diff --git a/src/shared/virt.c b/src/shared/virt.c index f10baab40..7c1381f4b 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -101,6 +101,22 @@ static int detect_vm_cpuid(const char **_id) { return 0; } +static int detect_vm_devicetree(const char **_id) { +#if defined(__powerpc__) || defined(__powerpc64__) + _cleanup_free_ char *hvtype = NULL; + int r; + + r = read_one_line_file("/sys/firmware/devicetree/base/hypervisor/compatible", &hvtype); + if (r >= 0) { + if (streq(hvtype, "linux,kvm")) { + *_id = "kvm"; + return 1; + } + } +#endif + return 0; +} + static int detect_vm_dmi(const char **_id) { /* Both CPUID and DMI are x86 specific interfaces... */ @@ -204,6 +220,10 @@ int detect_vm(const char **id) { if (r != 0) goto finish; + r = detect_vm_devicetree(&_id); + if (r != 0) + goto finish; + if (_id) { /* "other" */ r = 1;