compel: criu -- Start using uapi/std syscalls stubs

Real syscalls generation is inside criu for a while
but will be moved out in the next patch.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/arch/aarch64/restorer.c

@@ -3,7 +3,7 @@
 #include "restorer.h"
 #include "asm/restorer.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "log.h"
 #include "asm/fpu.h"
 #include "cpu.h"

criu/arch/aarch64/vdso-pie.c

@@ -2,7 +2,7 @@
 
 #include "asm/types.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "parasite-vdso.h"
 #include "log.h"
 #include "common/bug.h"

criu/arch/arm/restorer.c

@@ -3,7 +3,7 @@
 #include "restorer.h"
 #include "asm/restorer.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "log.h"
 #include "asm/fpu.h"
 #include "cpu.h"

criu/arch/ppc64/restorer.c

@@ -4,7 +4,7 @@
 #include "asm/restorer.h"
 #include "asm/fpu.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "log.h"
 
 int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r)

criu/arch/ppc64/vdso-pie.c

@@ -3,7 +3,7 @@
 
 #include "asm/types.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "parasite-vdso.h"
 #include "log.h"
 #include "common/bug.h"

criu/arch/x86/crtools.c

@@ -21,7 +21,7 @@
 #include "util.h"
 #include "cpu.h"
 #include "errno.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
 #include "kerndat.h"
 
 #include "protobuf.h"

criu/arch/x86/include/asm/restorer.h

@@ -4,6 +4,7 @@
 #include "asm/types.h"
 #include "asm/fpu.h"
 #include "images/core.pb-c.h"
+#include "uapi/std/syscall-codes.h"
 
 #include "sigframe.h"
 

criu/arch/x86/restorer.c

@@ -7,7 +7,7 @@
 #include "asm/fpu.h"
 #include "asm/string.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "log.h"
 #include "cpu.h"
 

criu/arch/x86/sigaction_compat.c

@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 
 #ifdef CR_NOGLIBC
-# include "syscall.h"
+# include "uapi/std/syscall.h"
 #else
 # define sys_mmap mmap
 # define sys_munmap munmap

criu/arch/x86/vdso-pie.c

@@ -3,7 +3,7 @@
 #include "string.h"
 #include "asm/types.h"
 
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "parasite-vdso.h"
 #include "log.h"
 #include "common/bug.h"

criu/cr-restore.c

@@ -79,7 +79,7 @@
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
 
 #include "protobuf.h"
 #include "images/sa.pb-c.h"

criu/fsnotify.c

@@ -41,7 +41,7 @@
 #include "namespaces.h"
 #include "pstree.h"
 #include "fault-injection.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
 
 #include "protobuf.h"
 #include "images/fsnotify.pb-c.h"

criu/kerndat.c

@@ -26,8 +26,8 @@
 #include "lsm.h"
 #include "proc_parse.h"
 #include "config.h"
-#include "syscall-codes.h"
 #include "sk-inet.h"
+#include "uapi/std/syscall-codes.h"
 
 struct kerndat_s kdat = {
 };

criu/parasite-syscall.c

@@ -30,7 +30,7 @@
 #include "proc_parse.h"
 #include "aio.h"
 #include "fault-injection.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
 #include "signal.h"
 #include "sigframe.h"
 

criu/pie/log-simple.c

@@ -4,7 +4,7 @@
 #include "types.h"
 #include "string.h"
 #include "common/bitsperlong.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "log.h"
 
 struct simple_buf {

criu/pie/parasite-vdso.c

@@ -12,7 +12,7 @@
 #include "int.h"
 #include "types.h"
 #include "page.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "image.h"
 #include "parasite-vdso.h"
 #include "vma.h"

criu/pie/parasite.c

@@ -9,7 +9,7 @@
 
 #include "int.h"
 #include "types.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "parasite.h"
 #include "config.h"
 #include "fcntl.h"

criu/pie/restorer.c

@@ -21,7 +21,7 @@
 #include "types.h"
 #include "common/compiler.h"
 #include "string.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
 #include "signal.h"
 #include "config.h"
 #include "prctl.h"

criu/pie/util-fd.c

@@ -11,7 +11,7 @@
 #include "string.h"
 
 #ifdef CR_NOGLIBC
-# include "syscall.h"
+# include "uapi/std/syscall.h"
 # define __sys(foo)	sys_##foo
 # define __sys_err(ret)	ret
 #else

criu/pie/util.c

@@ -13,7 +13,7 @@
 #include "util-pie.h"
 
 #ifdef CR_NOGLIBC
-# include "syscall.h"
+# include "uapi/std/syscall.h"
 # define __sys(foo)     sys_##foo
 #else
 # define __sys(foo)     foo

criu/shmem.c

@@ -16,7 +16,7 @@
 #include "vma.h"
 #include "mem.h"
 #include "config.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
 #include "bitops.h"
 #include "log.h"
 #include "types.h"

include/common/lock.h

@@ -15,7 +15,7 @@
 #define LOCK_BUG()	LOCK_BUG_ON(1)
 
 #ifdef CR_NOGLIBC
-# include "syscall.h"
+# include "uapi/std/syscall.h"
 #else
 # include <unistd.h>
 # include <sys/syscall.h>