X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fvirt.h;h=f448f4e8fbc0afe8190c2f7e1f73a8ba18a4cba5;hp=feb47d50e37eef578addb8e43431c59296761d21;hb=70f7776c6e8c549e13adf858c57fe339583c7cec;hpb=166f4e4fb53a82900ff9ae080e0ff37d35d4dacd diff --git a/src/basic/virt.h b/src/basic/virt.h index feb47d50e..f448f4e8f 100644 --- a/src/basic/virt.h +++ b/src/basic/virt.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -39,6 +37,7 @@ enum { VIRTUALIZATION_MICROSOFT, VIRTUALIZATION_ZVM, VIRTUALIZATION_PARALLELS, + VIRTUALIZATION_BHYVE, VIRTUALIZATION_VM_OTHER, VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER, @@ -56,6 +55,7 @@ enum { _VIRTUALIZATION_INVALID = -1 }; +#if 0 /// UNNEEDED by elogind static inline bool VIRTUALIZATION_IS_VM(int x) { return x >= VIRTUALIZATION_VM_FIRST && x <= VIRTUALIZATION_VM_LAST; } @@ -65,11 +65,13 @@ static inline bool VIRTUALIZATION_IS_CONTAINER(int x) { } int detect_vm(void); +#endif // 0 int detect_container(void); #if 0 /// UNNEEDED by elogind int detect_virtualization(void); -#endif // 0 +int running_in_userns(void); +#endif // 0 int running_in_chroot(void); const char *virtualization_to_string(int v) _const_;