anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone
923a60
From 436a001a5a28b9e3dd0988cc5a88bd3d7ec0acc8 Mon Sep 17 00:00:00 2001
923a60
From: Andrew Jones <drjones@redhat.com>
923a60
Date: Tue, 31 Mar 2015 11:08:11 +0200
923a60
Subject: [PATCH] detect-virt: use /proc/device-tree
923a60
923a60
Kernel doc Documentation/ABI/testing/sysfs-firmware-ofw says that
923a60
the /proc/device-tree symlink should be used, as opposed to
923a60
directly accessing /sys/firmware/devicetree/base. The former is
923a60
ABI, but not the later.
923a60
923a60
Cherry-picked from: b8f1df82646d2
923a60
Resolves: #1207773
923a60
---
923a60
 src/shared/virt.c | 2 +-
923a60
 1 file changed, 1 insertion(+), 1 deletion(-)
923a60
923a60
diff --git a/src/shared/virt.c b/src/shared/virt.c
923a60
index 7c1381f4b8..aa3501f429 100644
923a60
--- a/src/shared/virt.c
923a60
+++ b/src/shared/virt.c
923a60
@@ -106,7 +106,7 @@ static int detect_vm_devicetree(const char **_id) {
923a60
         _cleanup_free_ char *hvtype = NULL;
923a60
         int r;
923a60
 
923a60
-        r = read_one_line_file("/sys/firmware/devicetree/base/hypervisor/compatible", &hvtype);
923a60
+        r = read_one_line_file("/proc/device-tree/hypervisor/compatible", &hvtype);
923a60
         if (r >= 0) {
923a60
                 if (streq(hvtype, "linux,kvm")) {
923a60
                         *_id = "kvm";