chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: simplify cg_[all_]unified()
[elogind.git]
/
src
/
basic
/
virt.h
diff --git
a/src/basic/virt.h
b/src/basic/virt.h
index d63e028a23cd997008bf1e461907c7212db37729..f448f4e8fbc0afe8190c2f7e1f73a8ba18a4cba5 100644
(file)
--- 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
/***
#pragma once
/***
@@
-39,6
+37,7
@@
enum {
VIRTUALIZATION_MICROSOFT,
VIRTUALIZATION_ZVM,
VIRTUALIZATION_PARALLELS,
VIRTUALIZATION_MICROSOFT,
VIRTUALIZATION_ZVM,
VIRTUALIZATION_PARALLELS,
+ VIRTUALIZATION_BHYVE,
VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,
@@
-48,6
+47,7
@@
enum {
VIRTUALIZATION_LXC,
VIRTUALIZATION_OPENVZ,
VIRTUALIZATION_DOCKER,
VIRTUALIZATION_LXC,
VIRTUALIZATION_OPENVZ,
VIRTUALIZATION_DOCKER,
+ VIRTUALIZATION_RKT,
VIRTUALIZATION_CONTAINER_OTHER,
VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER,
VIRTUALIZATION_CONTAINER_OTHER,
VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER,
@@
-55,6
+55,7
@@
enum {
_VIRTUALIZATION_INVALID = -1
};
_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;
}
static inline bool VIRTUALIZATION_IS_VM(int x) {
return x >= VIRTUALIZATION_VM_FIRST && x <= VIRTUALIZATION_VM_LAST;
}
@@
-64,8
+65,14
@@
static inline bool VIRTUALIZATION_IS_CONTAINER(int x) {
}
int detect_vm(void);
}
int detect_vm(void);
+#endif // 0
int detect_container(void);
int detect_container(void);
-// UNNEEDED int detect_virtualization(void);
+#if 0 /// UNNEEDED by elogind
+int detect_virtualization(void);
+
+int running_in_userns(void);
+#endif // 0
+int running_in_chroot(void);
const char *virtualization_to_string(int v) _const_;
int virtualization_from_string(const char *s) _pure_;
const char *virtualization_to_string(int v) _const_;
int virtualization_from_string(const char *s) _pure_;