[libvirt] [PATCH 4/4] Revert "lxc: ensure setns() syscall is defined"

Michal Privoznik mprivozn at redhat.com
Thu Aug 27 01:06:54 UTC 2015


After my previous commit this commit is no longer needed.

This reverts commit eff95ac8fce8af47c0948a1c8a654b210633a350.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/lxc/lxc_container.c | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index eb7cad6..b621d1d 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -95,40 +95,6 @@ VIR_LOG_INIT("lxc.lxc_container");
 # define CLONE_NEWNET  0x40000000 /* New network namespace */
 #endif
 
-/*
- * Workaround older glibc. While kernel may support the setns
- * syscall, the glibc wrapper might not exist. If that's the
- * case, use our own.
- */
-#ifndef __NR_setns
-# if defined(__x86_64__)
-#  define __NR_setns 308
-# elif defined(__i386__)
-#  define __NR_setns 346
-# elif defined(__arm__)
-#  define __NR_setns 375
-# elif defined(__aarch64__)
-#  define __NR_setns 375
-# elif defined(__powerpc__)
-#  define __NR_setns 350
-# elif defined(__s390__)
-#  define __NR_setns 339
-# endif
-#endif
-
-#ifndef HAVE_SETNS
-# if defined(__NR_setns)
-#  include <sys/syscall.h>
-
-static inline int setns(int fd, int nstype)
-{
-    return syscall(__NR_setns, fd, nstype);
-}
-# else /* !__NR_setns */
-#  error Please determine the syscall number for setns on your architecture
-# endif
-#endif
-
 /* messages between parent and container */
 typedef char lxc_message_t;
 #define LXC_CONTINUE_MSG 'c'
-- 
2.4.6




More information about the libvir-list mailing list