X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fbasic%2Fvirt.c;h=fdbb5018191529c054dea8b150e885fe7c9aa634;hb=53e1b683907c2f12330f00feb9630150196f064d;hp=9d615da681e1e0a535b99b564326d070a14a1681;hpb=2f8e375d170f51c8224652ebb976c12a6a018da9;p=thirdparty%2Fsystemd.git

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 9d615da681e..fdbb5018191 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   This file is part of systemd.
 
@@ -28,7 +29,6 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "fs-util.h"
 #include "macro.h"
 #include "process-util.h"
 #include "stat-util.h"
@@ -47,6 +47,7 @@ static int detect_vm_cpuid(void) {
         } cpuid_vendor_table[] = {
                 { "XenVMMXenVMM", VIRTUALIZATION_XEN       },
                 { "KVMKVMKVM",    VIRTUALIZATION_KVM       },
+                { "TCGTCGTCGTCG", VIRTUALIZATION_QEMU      },
                 /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
                 { "VMwareVMware", VIRTUALIZATION_VMWARE    },
                 /* https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs */
@@ -216,6 +217,7 @@ static int detect_vm_dmi(void) {
 }
 
 static int detect_vm_xen(void) {
+
         /* Check for Dom0 will be executed later in detect_vm_xen_dom0
            Thats why we dont check the content of /proc/xen/capabilities here. */
         if (access("/proc/xen/capabilities", F_OK) < 0) {
@@ -224,8 +226,7 @@ static int detect_vm_xen(void) {
         }
 
         log_debug("Virtualization XEN found (/proc/xen/capabilities exists)");
-        return  VIRTUALIZATION_XEN;
-
+        return VIRTUALIZATION_XEN;
 }
 
 static bool detect_vm_xen_dom0(void) {
@@ -317,6 +318,7 @@ static int detect_vm_zvm(void) {
 int detect_vm(void) {
         static thread_local int cached_found = _VIRTUALIZATION_INVALID;
         int r, dmi;
+        bool other = false;
 
         if (cached_found >= 0)
                 return cached_found;
@@ -337,14 +339,22 @@ int detect_vm(void) {
         r = detect_vm_cpuid();
         if (r < 0)
                 return r;
-        if (r != VIRTUALIZATION_NONE)
-                goto finish;
+        if (r != VIRTUALIZATION_NONE) {
+                if (r == VIRTUALIZATION_VM_OTHER)
+                        other = true;
+                else
+                        goto finish;
+        }
 
         r = dmi;
         if (r < 0)
                 return r;
-        if (r != VIRTUALIZATION_NONE)
-                goto finish;
+        if (r != VIRTUALIZATION_NONE) {
+                if (r == VIRTUALIZATION_VM_OTHER)
+                        other = true;
+                else
+                        goto finish;
+        }
 
         /* x86 xen will most likely be detected by cpuid. If not (most likely
          * because we're not an x86 guest), then we should try the xen capabilities
@@ -356,26 +366,42 @@ int detect_vm(void) {
         r = detect_vm_xen();
         if (r < 0)
                 return r;
-        if (r != VIRTUALIZATION_NONE)
-                goto finish;
+        if (r != VIRTUALIZATION_NONE) {
+                if (r == VIRTUALIZATION_VM_OTHER)
+                        other = true;
+                else
+                        goto finish;
+        }
 
         r = detect_vm_hypervisor();
         if (r < 0)
                 return r;
-        if (r != VIRTUALIZATION_NONE)
-                goto finish;
+        if (r != VIRTUALIZATION_NONE) {
+                if (r == VIRTUALIZATION_VM_OTHER)
+                        other = true;
+                else
+                        goto finish;
+        }
 
         r = detect_vm_device_tree();
         if (r < 0)
                 return r;
-        if (r != VIRTUALIZATION_NONE)
-                goto finish;
+        if (r != VIRTUALIZATION_NONE) {
+                if (r == VIRTUALIZATION_VM_OTHER)
+                        other = true;
+                else
+                        goto finish;
+        }
 
         r = detect_vm_uml();
         if (r < 0)
                 return r;
-        if (r != VIRTUALIZATION_NONE)
-                goto finish;
+        if (r != VIRTUALIZATION_NONE) {
+                if (r == VIRTUALIZATION_VM_OTHER)
+                        other = true;
+                else
+                        goto finish;
+        }
 
         r = detect_vm_zvm();
         if (r < 0)
@@ -387,6 +413,8 @@ finish:
          * double-check it */
         if (r == VIRTUALIZATION_XEN && detect_vm_xen_dom0())
                 r = VIRTUALIZATION_NONE;
+        else if (r == VIRTUALIZATION_NONE && other)
+                r = VIRTUALIZATION_VM_OTHER;
 
         cached_found = r;
         log_debug("Found VM virtualization %s", virtualization_to_string(r));
@@ -422,7 +450,7 @@ int detect_container(void) {
                 goto finish;
         }
 
-        if (getpid() == 1) {
+        if (getpid_cached() == 1) {
                 /* If we are PID 1 we can just check our own environment variable, and that's authoritative. */
 
                 e = getenv("container");
@@ -570,30 +598,16 @@ int running_in_userns(void) {
 }
 
 int running_in_chroot(void) {
-        _cleanup_free_ char *self_mnt = NULL, *pid1_mnt = NULL;
-        int r;
-
-        /* Try to detect whether we are running in a chroot() environment. Specifically, check whether we have a
-         * different root directory than PID 1, even though we live in the same mount namespace as it. */
+        int ret;
 
         if (getenv_bool("SYSTEMD_IGNORE_CHROOT") > 0)
                 return 0;
 
-        r = files_same("/proc/1/root", "/");
-        if (r < 0)
-                return r;
-        if (r > 0)
-                return 0;
-
-        r = readlink_malloc("/proc/self/ns/mnt", &self_mnt);
-        if (r < 0)
-                return r;
-
-        r = readlink_malloc("/proc/1/ns/mnt", &pid1_mnt);
-        if (r < 0)
-                return r;
+        ret = files_same("/proc/1/root", "/", 0);
+        if (ret < 0)
+                return ret;
 
-        return streq(self_mnt, pid1_mnt); /* Only if we live in the same namespace! */
+        return ret == 0;
 }
 
 static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {