proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 10:37:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

python-lxc: don't use private lxc/confile.h

Browse Source 
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
This commit is contained in:
Aleksandr Mezin 2016-05-27 15:13:18 +06:00
parent 0fbd2f6a89
commit 58a44782d9
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/python-lxc/lxc.c
View File

@ -25,7 +25,6 @@
#include <Python.h> #include <Python.h>
#include "structmember.h" #include "structmember.h"
#include <lxc/lxccontainer.h> #include <lxc/lxccontainer.h>
#include "lxc/confile.h"
#include <stdio.h> #include <stdio.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sched.h> #include <sched.h>
@ -58,6 +57,10 @@
# define CLONE_NEWNET 0x40000000 # define CLONE_NEWNET 0x40000000
#endif #endif
/* From sys/personality.h */
#define PER_LINUX 0x0000
#define PER_LINUX32 0x0008
/* Helper functions */ /* Helper functions */
/* Copied from lxc/utils.c */ /* Copied from lxc/utils.c */
@ -77,6 +80,36 @@ again:
return status; return status;
} }
/* Copied from lxc/confile.c, with HAVE_SYS_PERSONALITY_H check removed */
signed long lxc_config_parse_arch(const char *arch)
{
struct per_name {
char *name;
unsigned long per;
} pername[] = {
{ "x86", PER_LINUX32 },
{ "linux32", PER_LINUX32 },
{ "i386", PER_LINUX32 },
{ "i486", PER_LINUX32 },
{ "i586", PER_LINUX32 },
{ "i686", PER_LINUX32 },
{ "athlon", PER_LINUX32 },
{ "linux64", PER_LINUX },
{ "x86_64", PER_LINUX },
{ "amd64", PER_LINUX },
};
size_t len = sizeof(pername) / sizeof(pername[0]);
size_t i;
for (i = 0; i < len; i++) {
if (!strcmp(pername[i].name, arch))
return pername[i].per;
}
return -1;
}
char** char**
convert_tuple_to_char_pointer_array(PyObject *argv) { convert_tuple_to_char_pointer_array(PyObject *argv) {
int argc; int argc;