[CRIU] [PATCH 6/7] compel: criu -- Start using uapi/std syscalls stubs
Cyrill Gorcunov
gorcunov at openvz.org
Mon Sep 26 12:36:38 PDT 2016
Real syscalls generation is inside criu for a while
but will be moved out in the next patch.
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
criu/arch/aarch64/restorer.c | 2 +-
criu/arch/aarch64/vdso-pie.c | 2 +-
criu/arch/arm/restorer.c | 2 +-
criu/arch/ppc64/restorer.c | 2 +-
criu/arch/ppc64/vdso-pie.c | 2 +-
criu/arch/x86/crtools.c | 2 +-
criu/arch/x86/include/asm/restorer.h | 2 +-
criu/arch/x86/restorer.c | 2 +-
criu/arch/x86/sigaction_compat.c | 2 +-
criu/arch/x86/vdso-pie.c | 2 +-
criu/cr-restore.c | 2 +-
criu/fsnotify.c | 2 +-
criu/include/lock.h | 2 +-
criu/kerndat.c | 2 +-
criu/parasite-syscall.c | 2 +-
criu/pie/log-simple.c | 2 +-
criu/pie/parasite-vdso.c | 2 +-
criu/pie/parasite.c | 2 +-
criu/pie/restorer.c | 2 +-
criu/pie/util-fd.c | 2 +-
criu/pie/util.c | 2 +-
criu/shmem.c | 2 +-
criu/uffd.c | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/criu/arch/aarch64/restorer.c b/criu/arch/aarch64/restorer.c
index 2c61e2d03109..8a206315ddc0 100644
--- a/criu/arch/aarch64/restorer.c
+++ b/criu/arch/aarch64/restorer.c
@@ -4,7 +4,7 @@
#include "asm/restorer.h"
#include "asm/string.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "log.h"
#include "asm/fpu.h"
#include "cpu.h"
diff --git a/criu/arch/aarch64/vdso-pie.c b/criu/arch/aarch64/vdso-pie.c
index 0f06c2d191d1..6967b5cf644c 100644
--- a/criu/arch/aarch64/vdso-pie.c
+++ b/criu/arch/aarch64/vdso-pie.c
@@ -3,7 +3,7 @@
#include "asm/string.h"
#include "asm/types.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "parasite-vdso.h"
#include "log.h"
#include "bug.h"
diff --git a/criu/arch/arm/restorer.c b/criu/arch/arm/restorer.c
index 786feeeb31bd..ea9ae680547a 100644
--- a/criu/arch/arm/restorer.c
+++ b/criu/arch/arm/restorer.c
@@ -4,7 +4,7 @@
#include "asm/restorer.h"
#include "asm/string.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "log.h"
#include "asm/fpu.h"
#include "cpu.h"
diff --git a/criu/arch/ppc64/restorer.c b/criu/arch/ppc64/restorer.c
index 5379e60182b8..3f0aff87a5d4 100644
--- a/criu/arch/ppc64/restorer.c
+++ b/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)
diff --git a/criu/arch/ppc64/vdso-pie.c b/criu/arch/ppc64/vdso-pie.c
index db4aadb494ce..b3994f11e0d0 100644
--- a/criu/arch/ppc64/vdso-pie.c
+++ b/criu/arch/ppc64/vdso-pie.c
@@ -3,7 +3,7 @@
#include "asm/string.h"
#include "asm/types.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "parasite-vdso.h"
#include "log.h"
#include "bug.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index f222b5511249..6c196420c793 100644
--- a/criu/arch/x86/crtools.c
+++ b/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"
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 27503e858b8f..a10f3c9d9c88 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -4,7 +4,7 @@
#include "asm/types.h"
#include "asm/fpu.h"
#include "images/core.pb-c.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
struct rt_sigcontext {
unsigned long r8;
diff --git a/criu/arch/x86/restorer.c b/criu/arch/x86/restorer.c
index 3de0146e816b..0c0725147250 100644
--- a/criu/arch/x86/restorer.c
+++ b/criu/arch/x86/restorer.c
@@ -6,7 +6,7 @@
#include "asm/fpu.h"
#include "asm/string.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "log.h"
#include "cpu.h"
diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c
index ef6d13c9101f..214b2058bf63 100644
--- a/criu/arch/x86/sigaction_compat.c
+++ b/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
diff --git a/criu/arch/x86/vdso-pie.c b/criu/arch/x86/vdso-pie.c
index 7f13915255a7..1d27716c4da3 100644
--- a/criu/arch/x86/vdso-pie.c
+++ b/criu/arch/x86/vdso-pie.c
@@ -3,7 +3,7 @@
#include "asm/string.h"
#include "asm/types.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "parasite-vdso.h"
#include "log.h"
#include "bug.h"
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index a0e16ee519c2..784af5d5ae3c 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -80,7 +80,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"
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index dd3b78ad5099..87c47d5036a9 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -42,7 +42,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"
diff --git a/criu/include/lock.h b/criu/include/lock.h
index 8a765338bd42..1d2cab00eb7e 100644
--- a/criu/include/lock.h
+++ b/criu/include/lock.h
@@ -11,7 +11,7 @@
#include "bug.h"
#ifdef CR_NOGLIBC
-# include "syscall.h"
+# include "uapi/std/syscall.h"
#else
# include <unistd.h>
# include <sys/syscall.h>
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 1c0986fe4952..a4ec2f778c90 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -22,7 +22,7 @@
#include "lsm.h"
#include "proc_parse.h"
#include "config.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
struct kerndat_s kdat = {
};
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index ad33098567ec..2e074a914765 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -29,7 +29,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 <string.h>
diff --git a/criu/pie/log-simple.c b/criu/pie/log-simple.c
index 5d9394683d28..39b95b94d631 100644
--- a/criu/pie/log-simple.c
+++ b/criu/pie/log-simple.c
@@ -2,7 +2,7 @@
#include "asm/bitsperlong.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "log.h"
struct simple_buf {
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index af969a150fee..ea8a1f2b1d75 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -13,7 +13,7 @@
#include "asm/types.h"
#include "asm/page.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "image.h"
#include "parasite-vdso.h"
#include "vma.h"
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 6c556542f6dd..e738077c60fa 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -7,7 +7,7 @@
#include <stdarg.h>
#include <sys/ioctl.h>
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "parasite.h"
#include "config.h"
#include "fcntl.h"
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 2e314e8171dc..9851238a7453 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -22,7 +22,7 @@
#include "compiler.h"
#include "asm/string.h"
#include "asm/types.h"
-#include "syscall.h"
+#include "uapi/std/syscall.h"
#include "signal.h"
#include "config.h"
#include "prctl.h"
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index 14d7d14500b2..78252cd22241 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -10,7 +10,7 @@
#include "asm/types.h"
#ifdef CR_NOGLIBC
-# include "syscall.h"
+# include "uapi/std/syscall.h"
# define __sys(foo) sys_##foo
#else
# define __sys(foo) foo
diff --git a/criu/pie/util.c b/criu/pie/util.c
index 7dcef39a699b..4dace66b03b6 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -12,7 +12,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
diff --git a/criu/shmem.c b/criu/shmem.c
index 341e3bc1375b..bfdaa80654a8 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -15,7 +15,7 @@
#include "vma.h"
#include "mem.h"
#include "config.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
#include "asm/bitops.h"
#include "protobuf.h"
diff --git a/criu/uffd.c b/criu/uffd.c
index 81dc7ae5cea3..a280f6a31c8c 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -32,7 +32,7 @@
#include "crtools.h"
#include "cr_options.h"
#include "xmalloc.h"
-#include "syscall-codes.h"
+#include "uapi/std/syscall-codes.h"
#include "restorer.h"
#include "page-xfer.h"
#include "lock.h"
--
2.7.4
More information about the CRIU
mailing list