[CRIU] [PATCH] build: Drop protobuf/ from the sources
Cyrill Gorcunov
gorcunov at openvz.org
Mon Feb 15 07:29:34 PST 2016
All sitting in images/ already.
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
criu/aio.c | 2 +-
criu/arch/aarch64/crtools.c | 4 +-
criu/arch/aarch64/include/asm/restore.h | 2 +-
criu/arch/aarch64/include/asm/restorer.h | 2 +-
criu/arch/aarch64/include/asm/types.h | 2 +-
criu/arch/arm/crtools.c | 4 +-
criu/arch/arm/include/asm/restore.h | 2 +-
criu/arch/arm/include/asm/restorer.h | 2 +-
criu/arch/arm/include/asm/types.h | 2 +-
criu/arch/ppc64/cpu.c | 2 +-
criu/arch/ppc64/crtools.c | 4 +-
criu/arch/ppc64/include/asm/restore.h | 2 +-
criu/arch/ppc64/include/asm/types.h | 2 +-
criu/arch/x86/cpu.c | 2 +-
criu/arch/x86/crtools.c | 4 +-
criu/arch/x86/include/asm/restore.h | 2 +-
criu/arch/x86/include/asm/restorer.h | 2 +-
criu/arch/x86/include/asm/types.h | 2 +-
criu/cgroup.c | 4 +-
criu/cr-dump.c | 16 +++---
criu/cr-restore.c | 12 ++--
criu/cr-show.c | 6 +-
criu/eventfd.c | 2 +-
criu/eventpoll.c | 2 +-
criu/fifo.c | 4 +-
criu/files-ext.c | 2 +-
criu/files-reg.c | 4 +-
criu/files.c | 4 +-
criu/fsnotify.c | 4 +-
criu/image.c | 4 +-
criu/include/aio.h | 2 +-
criu/include/cr-service.h | 2 +-
criu/include/crtools.h | 2 +-
criu/include/file-ids.h | 2 +-
criu/include/file-lock.h | 2 +-
criu/include/files-reg.h | 4 +-
criu/include/files.h | 8 +--
criu/include/fsnotify.h | 2 +-
criu/include/lsm.h | 4 +-
criu/include/net.h | 2 +-
criu/include/page-read.h | 2 +-
criu/include/parasite-vdso.h | 2 +-
criu/include/parasite.h | 4 +-
criu/include/pipes.h | 4 +-
criu/include/proc_parse.h | 12 ++--
criu/include/pstree.h | 2 +-
criu/include/restorer.h | 8 +--
criu/include/seccomp.h | 2 +-
criu/include/shmem.h | 2 +-
criu/include/sigframe.h | 2 +-
criu/include/sk-inet.h | 2 +-
criu/include/sockets.h | 2 +-
criu/include/tun.h | 2 +-
criu/include/util.h | 2 +-
criu/include/vma.h | 2 +-
criu/ipc_ns.c | 8 +--
criu/irmap.c | 4 +-
criu/lsm.c | 4 +-
criu/mem.c | 2 +-
criu/mount.c | 4 +-
criu/namespaces.c | 4 +-
criu/net.c | 4 +-
criu/page-read.c | 2 +-
criu/page-xfer.c | 2 +-
criu/parasite-syscall.c | 10 ++--
criu/pie/restorer.c | 4 +-
criu/pipes.c | 4 +-
criu/proc_parse.c | 4 +-
criu/protobuf-desc.c | 96 ++++++++++++++++----------------
criu/pstree.c | 2 +-
criu/seccomp.c | 2 +-
criu/shmem.c | 2 +-
criu/sigframe.c | 2 +-
criu/signalfd.c | 2 +-
criu/sk-netlink.c | 2 +-
criu/sk-packet.c | 4 +-
criu/sk-queue.c | 2 +-
criu/sk-tcp.c | 2 +-
criu/sk-unix.c | 2 +-
criu/stats.c | 2 +-
criu/timerfd.c | 2 +-
criu/tty.c | 2 +-
criu/tun.c | 2 +-
criu/uts_ns.c | 2 +-
protobuf | 1 -
85 files changed, 186 insertions(+), 187 deletions(-)
delete mode 120000 protobuf
diff --git a/criu/aio.c b/criu/aio.c
index 9965efd8c483..4c1f19ba1f78 100644
--- a/criu/aio.c
+++ b/criu/aio.c
@@ -6,7 +6,7 @@
#include "aio.h"
#include "parasite.h"
#include "parasite-syscall.h"
-#include "protobuf/mm.pb-c.h"
+#include "images/mm.pb-c.h"
int dump_aio_ring(MmEntry *mme, struct vma_area *vma)
{
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 5df7f1d5fd6c..7a2510666255 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -9,8 +9,8 @@
#include "ptrace.h"
#include "asm/processor-flags.h"
#include "protobuf.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/creds.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
#include "parasite-syscall.h"
#include "log.h"
#include "util.h"
diff --git a/criu/arch/aarch64/include/asm/restore.h b/criu/arch/aarch64/include/asm/restore.h
index 69404b0e815e..2345a579ae23 100644
--- a/criu/arch/aarch64/include/asm/restore.h
+++ b/criu/arch/aarch64/include/asm/restore.h
@@ -3,7 +3,7 @@
#include "asm/restorer.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \
task_args) \
diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index 583f9583b836..66abe857ea29 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -5,7 +5,7 @@
#include <sys/ucontext.h>
#include "asm/types.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
/* Copied from the kernel header arch/arm64/include/uapi/asm/sigcontext.h */
diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index d6c890dc0b16..970fde7412cc 100644
--- a/criu/arch/aarch64/include/asm/types.h
+++ b/criu/arch/aarch64/include/asm/types.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <signal.h>
#include <asm/ptrace.h>
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#include "asm/page.h"
#include "asm/bitops.h"
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 8ce889463f6a..958899000875 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -7,8 +7,8 @@
#include "ptrace.h"
#include "asm/processor-flags.h"
#include "protobuf.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/creds.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
#include "parasite-syscall.h"
#include "log.h"
#include "util.h"
diff --git a/criu/arch/arm/include/asm/restore.h b/criu/arch/arm/include/asm/restore.h
index a1e66a5d5aab..ef4704f404d7 100644
--- a/criu/arch/arm/include/asm/restore.h
+++ b/criu/arch/arm/include/asm/restore.h
@@ -3,7 +3,7 @@
#include "asm/restorer.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \
task_args) \
diff --git a/criu/arch/arm/include/asm/restorer.h b/criu/arch/arm/include/asm/restorer.h
index 8acb2d3e7db0..d5c6ed80a318 100644
--- a/criu/arch/arm/include/asm/restorer.h
+++ b/criu/arch/arm/include/asm/restorer.h
@@ -2,7 +2,7 @@
#define __CR_ASM_RESTORER_H__
#include "asm/types.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
/* Copied from the Linux kernel header arch/arm/include/asm/sigcontext.h */
diff --git a/criu/arch/arm/include/asm/types.h b/criu/arch/arm/include/asm/types.h
index d1d6cc3a2fa5..b186aafde52d 100644
--- a/criu/arch/arm/include/asm/types.h
+++ b/criu/arch/arm/include/asm/types.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <signal.h>
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#include "asm/page.h"
#include "asm/bitops.h"
diff --git a/criu/arch/ppc64/cpu.c b/criu/arch/ppc64/cpu.c
index d84a782c9047..3f6041ebdec3 100644
--- a/criu/arch/ppc64/cpu.c
+++ b/criu/arch/ppc64/cpu.c
@@ -15,7 +15,7 @@
#include "cpu.h"
#include "protobuf.h"
-#include "protobuf/cpuinfo.pb-c.h"
+#include "images/cpuinfo.pb-c.h"
static uint64_t hwcap[2];
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index b1f4f6381591..14b1e7cde353 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -18,8 +18,8 @@
#include "errno.h"
#include "protobuf.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/creds.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
#define MSR_VEC (1<<25)
#define MSR_VSX (1<<23)
diff --git a/criu/arch/ppc64/include/asm/restore.h b/criu/arch/ppc64/include/asm/restore.h
index 325ff96e1018..7e35943c0d95 100644
--- a/criu/arch/ppc64/include/asm/restore.h
+++ b/criu/arch/ppc64/include/asm/restore.h
@@ -3,7 +3,7 @@
#include "asm/restorer.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
/*
* Set R2 to blob + 8000 which is the default value
diff --git a/criu/arch/ppc64/include/asm/types.h b/criu/arch/ppc64/include/asm/types.h
index 3412dc75d6a0..be29dbb37a9a 100644
--- a/criu/arch/ppc64/include/asm/types.h
+++ b/criu/arch/ppc64/include/asm/types.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <signal.h>
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#include "asm/page.h"
#include "asm/bitops.h"
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index d703e68e3621..0b90c0c27ea0 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "protobuf.h"
-#include "protobuf/cpuinfo.pb-c.h"
+#include "images/cpuinfo.pb-c.h"
#undef LOG_PREFIX
#define LOG_PREFIX "cpu: "
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index f713b0d3fd40..1c43ab1d6eaa 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -20,8 +20,8 @@
#include "errno.h"
#include "protobuf.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/creds.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
/*
* Injected syscall instruction
diff --git a/criu/arch/x86/include/asm/restore.h b/criu/arch/x86/include/asm/restore.h
index 9d39b2bbae50..c00553dff24a 100644
--- a/criu/arch/x86/include/asm/restore.h
+++ b/criu/arch/x86/include/asm/restore.h
@@ -3,7 +3,7 @@
#include "asm/restorer.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#ifdef CONFIG_X86_64
#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 2021c41f5bb4..16a45d754931 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -3,7 +3,7 @@
#include "asm/types.h"
#include "asm/fpu.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
struct pt_regs {
unsigned long r15;
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index b2d018983ffa..56f967fe35f8 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -9,7 +9,7 @@
#include "asm/int.h"
#include "asm/prlimit.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#define SIGMAX 64
#define SIGMAX_OLD 31
diff --git a/criu/cgroup.c b/criu/cgroup.c
index 704f144f0001..c699b6bbdf47 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -19,8 +19,8 @@
#include "namespaces.h"
#include "seize.h"
#include "protobuf.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/cgroup.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/cgroup.pb-c.h"
/*
* These string arrays have the names of all the properties that will be
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 385b7bb7b25a..27cc1d6c26b7 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -23,14 +23,14 @@
#include <sys/resource.h>
#include "protobuf.h"
-#include "protobuf/fdinfo.pb-c.h"
-#include "protobuf/fs.pb-c.h"
-#include "protobuf/mm.pb-c.h"
-#include "protobuf/creds.pb-c.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/file-lock.pb-c.h"
-#include "protobuf/rlimit.pb-c.h"
-#include "protobuf/siginfo.pb-c.h"
+#include "images/fdinfo.pb-c.h"
+#include "images/fs.pb-c.h"
+#include "images/mm.pb-c.h"
+#include "images/creds.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/file-lock.pb-c.h"
+#include "images/rlimit.pb-c.h"
+#include "images/siginfo.pb-c.h"
#include "asm/types.h"
#include "list.h"
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 0985b8675f64..67032a347b46 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -79,12 +79,12 @@
#include "parasite-syscall.h"
#include "protobuf.h"
-#include "protobuf/sa.pb-c.h"
-#include "protobuf/timer.pb-c.h"
-#include "protobuf/vma.pb-c.h"
-#include "protobuf/rlimit.pb-c.h"
-#include "protobuf/pagemap.pb-c.h"
-#include "protobuf/siginfo.pb-c.h"
+#include "images/sa.pb-c.h"
+#include "images/timer.pb-c.h"
+#include "images/vma.pb-c.h"
+#include "images/rlimit.pb-c.h"
+#include "images/pagemap.pb-c.h"
+#include "images/siginfo.pb-c.h"
#include "asm/restore.h"
#include "asm/atomic.h"
diff --git a/criu/cr-show.c b/criu/cr-show.c
index 91d4d095a071..af88dc22e3f9 100644
--- a/criu/cr-show.c
+++ b/criu/cr-show.c
@@ -28,9 +28,9 @@
#include "crtools.h"
#include "protobuf.h"
-#include "protobuf/pstree.pb-c.h"
-#include "protobuf/pipe-data.pb-c.h"
-#include "protobuf/siginfo.pb-c.h"
+#include "images/pstree.pb-c.h"
+#include "images/pipe-data.pb-c.h"
+#include "images/siginfo.pb-c.h"
#define DEF_PAGES_PER_LINE 6
diff --git a/criu/eventfd.c b/criu/eventfd.c
index 21b5c9d7b6d8..f4baabc0ef76 100644
--- a/criu/eventfd.c
+++ b/criu/eventfd.c
@@ -22,7 +22,7 @@
#include "log.h"
#include "protobuf.h"
-#include "protobuf/eventfd.pb-c.h"
+#include "images/eventfd.pb-c.h"
#undef LOG_PREFIX
#define LOG_PREFIX "eventfd: "
diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index c414c35b9923..9fa13c2a5409 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -23,7 +23,7 @@
#include "log.h"
#include "protobuf.h"
-#include "protobuf/eventpoll.pb-c.h"
+#include "images/eventpoll.pb-c.h"
#undef LOG_PREFIX
#define LOG_PREFIX "epoll: "
diff --git a/criu/fifo.c b/criu/fifo.c
index bd06da9c16e7..7d65efcacafc 100644
--- a/criu/fifo.c
+++ b/criu/fifo.c
@@ -13,8 +13,8 @@
#include "fifo.h"
#include "protobuf.h"
-#include "protobuf/regfile.pb-c.h"
-#include "protobuf/fifo.pb-c.h"
+#include "images/regfile.pb-c.h"
+#include "images/fifo.pb-c.h"
/*
* FIFO checkpoint and restore is done in a bit unusual manner.
diff --git a/criu/files-ext.c b/criu/files-ext.c
index b196b259006b..4c22452175ad 100644
--- a/criu/files-ext.c
+++ b/criu/files-ext.c
@@ -7,7 +7,7 @@
#include "plugin.h"
#include "protobuf.h"
-#include "protobuf/ext-file.pb-c.h"
+#include "images/ext-file.pb-c.h"
static int dump_one_ext_file(int lfd, u32 id, const struct fd_parms *p)
{
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 7911d667351b..bdd0a25b50f1 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -30,8 +30,8 @@
#include "pstree.h"
#include "protobuf.h"
-#include "protobuf/regfile.pb-c.h"
-#include "protobuf/remap-file-path.pb-c.h"
+#include "images/regfile.pb-c.h"
+#include "images/remap-file-path.pb-c.h"
#include "files-reg.h"
#include "plugin.h"
diff --git a/criu/files.c b/criu/files.c
index db15527e9ed9..490592496f09 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -44,8 +44,8 @@
#include "parasite-syscall.h"
#include "protobuf.h"
-#include "protobuf/fs.pb-c.h"
-#include "protobuf/ext-file.pb-c.h"
+#include "images/fs.pb-c.h"
+#include "images/ext-file.pb-c.h"
#include "plugin.h"
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 59259c13e2c3..f633b406f30e 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -42,8 +42,8 @@
#include "pstree.h"
#include "protobuf.h"
-#include "protobuf/fsnotify.pb-c.h"
-#include "protobuf/mnt.pb-c.h"
+#include "images/fsnotify.pb-c.h"
+#include "images/mnt.pb-c.h"
#undef LOG_PREFIX
#define LOG_PREFIX "fsnotify: "
diff --git a/criu/image.c b/criu/image.c
index a164722bba5e..83e62d3e6560 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -10,8 +10,8 @@
#include "cgroup.h"
#include "lsm.h"
#include "protobuf.h"
-#include "protobuf/inventory.pb-c.h"
-#include "protobuf/pagemap.pb-c.h"
+#include "images/inventory.pb-c.h"
+#include "images/pagemap.pb-c.h"
bool fdinfo_per_id = false;
bool ns_per_id = false;
diff --git a/criu/include/aio.h b/criu/include/aio.h
index e839ec693da9..af6d68790c82 100644
--- a/criu/include/aio.h
+++ b/criu/include/aio.h
@@ -1,6 +1,6 @@
#ifndef __CR_AIO_H__
#define __CR_AIO_H__
-#include "protobuf/mm.pb-c.h"
+#include "images/mm.pb-c.h"
int dump_aio_ring(MmEntry *mme, struct vma_area *vma);
void free_aios(MmEntry *mme);
struct parasite_ctl;
diff --git a/criu/include/cr-service.h b/criu/include/cr-service.h
index 621cedbe7827..a417a4c15a26 100644
--- a/criu/include/cr-service.h
+++ b/criu/include/cr-service.h
@@ -1,7 +1,7 @@
#ifndef __CR_SERVICE_H__
#define __CR_SERVICE_H__
-#include "protobuf/rpc.pb-c.h"
+#include "images/rpc.pb-c.h"
extern int cr_service(bool deamon_mode);
int cr_service_work(int sk);
diff --git a/criu/include/crtools.h b/criu/include/crtools.h
index eaa70dcf4e4e..e26cd0d67418 100644
--- a/criu/include/crtools.h
+++ b/criu/include/crtools.h
@@ -8,7 +8,7 @@
#include "servicefd.h"
#include "protobuf.h"
-#include "protobuf/inventory.pb-c.h"
+#include "images/inventory.pb-c.h"
#define CR_FD_PERM (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
diff --git a/criu/include/file-ids.h b/criu/include/file-ids.h
index 2da4ceffde07..2673543bdf26 100644
--- a/criu/include/file-ids.h
+++ b/criu/include/file-ids.h
@@ -5,7 +5,7 @@
#include "asm/types.h"
#include "rbtree.h"
-#include "protobuf/fdinfo.pb-c.h"
+#include "images/fdinfo.pb-c.h"
#define FD_PID_INVALID (-2U)
#define FD_DESC_INVALID (-3U)
diff --git a/criu/include/file-lock.h b/criu/include/file-lock.h
index e771c0ee584c..d14024ad04d3 100644
--- a/criu/include/file-lock.h
+++ b/criu/include/file-lock.h
@@ -4,7 +4,7 @@
#include "list.h"
#include "protobuf.h"
-#include "protobuf/file-lock.pb-c.h"
+#include "images/file-lock.pb-c.h"
#define FL_UNKNOWN -1
#define FL_POSIX 1
diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h
index e2f611535294..1cbefb0b9aed 100644
--- a/criu/include/files-reg.h
+++ b/criu/include/files-reg.h
@@ -5,8 +5,8 @@
#include "files.h"
#include "image.h"
-#include "protobuf/regfile.pb-c.h"
-#include "protobuf/ghost-file.pb-c.h"
+#include "images/regfile.pb-c.h"
+#include "images/ghost-file.pb-c.h"
struct cr_imgset;
struct fd_parms;
diff --git a/criu/include/files.h b/criu/include/files.h
index 9ea234440a1e..5db6ab19cc65 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -10,9 +10,9 @@
#include "pid.h"
#include "rst_info.h"
-#include "protobuf/fdinfo.pb-c.h"
-#include "protobuf/fown.pb-c.h"
-#include "protobuf/vma.pb-c.h"
+#include "images/fdinfo.pb-c.h"
+#include "images/fown.pb-c.h"
+#include "images/vma.pb-c.h"
struct pstree_item;
struct file_desc;
@@ -80,7 +80,7 @@ static inline int fdinfo_rst_prio(struct fdinfo_list_entry *fd_a, struct fdinfo_
}
struct file_desc_ops {
- /* fd_types from protobuf/fdinfo.proto */
+ /* fd_types from images/fdinfo.proto */
unsigned int type;
/*
* Opens a file by whatever syscall is required for that.
diff --git a/criu/include/fsnotify.h b/criu/include/fsnotify.h
index 48e3982cf7aa..522fe3f6f7aa 100644
--- a/criu/include/fsnotify.h
+++ b/criu/include/fsnotify.h
@@ -5,7 +5,7 @@
#include "files.h"
#include "protobuf.h"
-#include "protobuf/fsnotify.pb-c.h"
+#include "images/fsnotify.pb-c.h"
#define KERNEL_FS_EVENT_ON_CHILD 0x08000000
diff --git a/criu/include/lsm.h b/criu/include/lsm.h
index bd13ef70b4c6..b6aff33e2769 100644
--- a/criu/include/lsm.h
+++ b/criu/include/lsm.h
@@ -1,8 +1,8 @@
#ifndef __CR_LSM_H__
#define __CR_LSM_H__
-#include "protobuf/inventory.pb-c.h"
-#include "protobuf/creds.pb-c.h"
+#include "images/inventory.pb-c.h"
+#include "images/creds.pb-c.h"
/*
* Get the Lsmtype for the current host.
diff --git a/criu/include/net.h b/criu/include/net.h
index 900b1365634e..ede380fcc6c4 100644
--- a/criu/include/net.h
+++ b/criu/include/net.h
@@ -22,7 +22,7 @@ extern void network_unlock(void);
extern struct ns_desc net_ns_desc;
-#include "protobuf/netdev.pb-c.h"
+#include "images/netdev.pb-c.h"
extern int write_netdev_img(NetDeviceEntry *nde, struct cr_imgset *fds);
extern int read_ns_sys_file(char *path, char *buf, int len);
extern int restore_link_parms(NetDeviceEntry *nde, int nlsk);
diff --git a/criu/include/page-read.h b/criu/include/page-read.h
index 827e4acd5d47..8951a72808bf 100644
--- a/criu/include/page-read.h
+++ b/criu/include/page-read.h
@@ -1,7 +1,7 @@
#ifndef __CR_PAGE_READ_H__
#define __CR_PAGE_READ_H__
-#include "protobuf/pagemap.pb-c.h"
+#include "images/pagemap.pb-c.h"
/*
* page_read -- engine, that reads pages from image file(s)
diff --git a/criu/include/parasite-vdso.h b/criu/include/parasite-vdso.h
index d4dc89b47ade..295430f6195a 100644
--- a/criu/include/parasite-vdso.h
+++ b/criu/include/parasite-vdso.h
@@ -6,7 +6,7 @@
#ifdef CONFIG_VDSO
#include "util-vdso.h"
-#include "protobuf/vma.pb-c.h"
+#include "images/vma.pb-c.h"
struct parasite_ctl;
struct vm_area_list;
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 063903b84874..d0afe171e22a 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -16,8 +16,8 @@
#include "image.h"
#include "util-pie.h"
-#include "protobuf/vma.pb-c.h"
-#include "protobuf/tty.pb-c.h"
+#include "images/vma.pb-c.h"
+#include "images/tty.pb-c.h"
#define __head __used __section(.head.text)
diff --git a/criu/include/pipes.h b/criu/include/pipes.h
index c8786164c4ec..d5c81f53b0fb 100644
--- a/criu/include/pipes.h
+++ b/criu/include/pipes.h
@@ -1,8 +1,8 @@
#ifndef __CR_PIPES_H__
#define __CR_PIPES_H__
-#include "protobuf/pipe-data.pb-c.h"
-#include "protobuf/pipe.pb-c.h"
+#include "images/pipe-data.pb-c.h"
+#include "images/pipe.pb-c.h"
extern struct collect_image_info pipe_cinfo;
extern int collect_pipes(void);
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 33cd07712c89..04fecd9fb9d5 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -8,12 +8,12 @@
#include "cgroup.h"
#include "mount.h"
-#include "protobuf/eventfd.pb-c.h"
-#include "protobuf/eventpoll.pb-c.h"
-#include "protobuf/signalfd.pb-c.h"
-#include "protobuf/fsnotify.pb-c.h"
-#include "protobuf/timerfd.pb-c.h"
-#include "protobuf/seccomp.pb-c.h"
+#include "images/eventfd.pb-c.h"
+#include "images/eventpoll.pb-c.h"
+#include "images/signalfd.pb-c.h"
+#include "images/fsnotify.pb-c.h"
+#include "images/timerfd.pb-c.h"
+#include "images/seccomp.pb-c.h"
#define PROC_TASK_COMM_LEN 32
#define PROC_TASK_COMM_LEN_FMT "(%31s"
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 47ce676a9eba..1a0899ae1e2c 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -5,7 +5,7 @@
#include "pid.h"
#include "image.h"
#include "rst_info.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
/*
* That's the init process which usually inherit
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 4c4377cdaf67..9896aa1f5dc3 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -23,10 +23,10 @@
#include <time.h>
-#include "protobuf/mm.pb-c.h"
-#include "protobuf/vma.pb-c.h"
-#include "protobuf/creds.pb-c.h"
-#include "protobuf/core.pb-c.h"
+#include "images/mm.pb-c.h"
+#include "images/vma.pb-c.h"
+#include "images/creds.pb-c.h"
+#include "images/core.pb-c.h"
struct task_restore_core_args;
struct thread_restore_args;
diff --git a/criu/include/seccomp.h b/criu/include/seccomp.h
index b5b26c80996d..8a5b9376d745 100644
--- a/criu/include/seccomp.h
+++ b/criu/include/seccomp.h
@@ -4,7 +4,7 @@
#include <linux/seccomp.h>
#include <linux/filter.h>
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
#ifndef SECCOMP_MODE_DISABLED
#define SECCOMP_MODE_DISABLED 0
diff --git a/criu/include/shmem.h b/criu/include/shmem.h
index 47dd0fd3b396..7988784a2567 100644
--- a/criu/include/shmem.h
+++ b/criu/include/shmem.h
@@ -2,7 +2,7 @@
#define __CR_SHMEM_H__
#include "lock.h"
-#include "protobuf/vma.pb-c.h"
+#include "images/vma.pb-c.h"
struct _VmaEntry;
extern int collect_shmem(int pid, struct _VmaEntry *vi);
diff --git a/criu/include/sigframe.h b/criu/include/sigframe.h
index 5ab09b1fd662..ed79869ba3bc 100644
--- a/criu/include/sigframe.h
+++ b/criu/include/sigframe.h
@@ -6,7 +6,7 @@
#define __CR_SIGFRAME_H__
#include "asm/types.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
struct rt_sigframe;
diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index 5b5fca63870c..3f273f4fdd27 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -7,7 +7,7 @@
#include "files.h"
#include "list.h"
#include "protobuf.h"
-#include "protobuf/sk-inet.pb-c.h"
+#include "images/sk-inet.pb-c.h"
#define INET_ADDR_LEN 40
#ifndef TCP_REPAIR
diff --git a/criu/include/sockets.h b/criu/include/sockets.h
index b726e2f7a0b3..df2517942545 100644
--- a/criu/include/sockets.h
+++ b/criu/include/sockets.h
@@ -7,7 +7,7 @@
#include "asm/types.h"
#include "protobuf.h"
-#include "protobuf/sk-opts.pb-c.h"
+#include "images/sk-opts.pb-c.h"
struct fdinfo_list_entry;
struct sk_opts_entry;
diff --git a/criu/include/tun.h b/criu/include/tun.h
index d70f8f2103c4..1e313d67aa59 100644
--- a/criu/include/tun.h
+++ b/criu/include/tun.h
@@ -5,7 +5,7 @@
#define TUN_MINOR 200
#endif
-#include "protobuf/netdev.pb-c.h"
+#include "images/netdev.pb-c.h"
extern const struct fdtype_ops tunfile_dump_ops;
extern int dump_tun_link(NetDeviceEntry *nde, struct cr_imgset *fds);
diff --git a/criu/include/util.h b/criu/include/util.h
index a64782783615..2b2babf9d492 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -19,7 +19,7 @@
#include "log.h"
#include "err.h"
-#include "protobuf/vma.pb-c.h"
+#include "images/vma.pb-c.h"
#define PREF_SHIFT_OP(pref, op, size) ((size) op (pref ##BYTES_SHIFT))
#define KBYTES_SHIFT 10
diff --git a/criu/include/vma.h b/criu/include/vma.h
index 6c28136612e9..247c5a33fbf9 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -5,7 +5,7 @@
#include "image.h"
#include "list.h"
-#include "protobuf/vma.pb-c.h"
+#include "images/vma.pb-c.h"
struct vm_area_list {
struct list_head h;
diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index 9abb40311a18..67803fdefb3a 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -16,10 +16,10 @@
#include "ipc_ns.h"
#include "protobuf.h"
-#include "protobuf/ipc-var.pb-c.h"
-#include "protobuf/ipc-shm.pb-c.h"
-#include "protobuf/ipc-sem.pb-c.h"
-#include "protobuf/ipc-msg.pb-c.h"
+#include "images/ipc-var.pb-c.h"
+#include "images/ipc-shm.pb-c.h"
+#include "images/ipc-sem.pb-c.h"
+#include "images/ipc-msg.pb-c.h"
#if defined (__GLIBC__) && __GLIBC__ >= 2
#define KEY __key
diff --git a/criu/irmap.c b/criu/irmap.c
index 81d245c3e851..15018875d4c6 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -27,8 +27,8 @@
#include "cr_options.h"
#include "protobuf.h"
-#include "protobuf/fsnotify.pb-c.h"
-#include "protobuf/fh.pb-c.h"
+#include "images/fsnotify.pb-c.h"
+#include "images/fh.pb-c.h"
#undef LOG_PREFIX
#define LOG_PREFIX "irmap: "
diff --git a/criu/lsm.c b/criu/lsm.c
index 158caf0733d5..aee733ccb4a4 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -10,8 +10,8 @@
#include "cr_options.h"
#include "protobuf.h"
-#include "protobuf/inventory.pb-c.h"
-#include "protobuf/creds.pb-c.h"
+#include "images/inventory.pb-c.h"
+#include "images/creds.pb-c.h"
#undef CONFIG_HAS_SELINUX
diff --git a/criu/mem.c b/criu/mem.c
index 332f1928bb2d..a58a87153f27 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -22,7 +22,7 @@
#include "pagemap-cache.h"
#include "protobuf.h"
-#include "protobuf/pagemap.pb-c.h"
+#include "images/pagemap.pb-c.h"
static int task_reset_dirty_track(int pid)
{
diff --git a/criu/mount.c b/criu/mount.c
index 05cf6cf0a0f9..7e4b4aab8a4f 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -29,8 +29,8 @@
#include "fs-magic.h"
#include "sysfs_parse.h"
-#include "protobuf/mnt.pb-c.h"
-#include "protobuf/binfmt-misc.pb-c.h"
+#include "images/mnt.pb-c.h"
+#include "images/binfmt-misc.pb-c.h"
#define AUTODETECTED_MOUNT "CRIU:AUTOGENERATED"
#define MS_PROPAGATE (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 9a7836bcad89..392092ade0d1 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -21,8 +21,8 @@
#include "net.h"
#include "protobuf.h"
-#include "protobuf/ns.pb-c.h"
-#include "protobuf/userns.pb-c.h"
+#include "images/ns.pb-c.h"
+#include "images/userns.pb-c.h"
static struct ns_desc *ns_desc_array[] = {
&net_ns_desc,
diff --git a/criu/net.c b/criu/net.c
index 9f62cd0c6ba2..349859c6a3d8 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -31,7 +31,7 @@
#include "kerndat.h"
#include "protobuf.h"
-#include "protobuf/netdev.pb-c.h"
+#include "images/netdev.pb-c.h"
static int ns_sysfs_fd = -1;
@@ -692,7 +692,7 @@ static int restore_link(NetDeviceEntry *nde, int nlsk)
switch (nde->type) {
case ND_TYPE__LOOPBACK: /* fallthrough */
- case ND_TYPE__EXTLINK: /* see comment in protobuf/netdev.proto */
+ case ND_TYPE__EXTLINK: /* see comment in images/netdev.proto */
return restore_link_parms(nde, nlsk);
case ND_TYPE__VENET:
return restore_one_link(nde, nlsk, venet_link_info);
diff --git a/criu/page-read.c b/criu/page-read.c
index 28ecd5bdb2bb..a18526531033 100644
--- a/criu/page-read.c
+++ b/criu/page-read.c
@@ -8,7 +8,7 @@
#include "page-read.h"
#include "protobuf.h"
-#include "protobuf/pagemap.pb-c.h"
+#include "images/pagemap.pb-c.h"
#ifndef SEEK_DATA
#define SEEK_DATA 3
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index eee8f5f17992..143e8986eab4 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -15,7 +15,7 @@
#include "page-pipe.h"
#include "util.h"
#include "protobuf.h"
-#include "protobuf/pagemap.pb-c.h"
+#include "images/pagemap.pb-c.h"
struct page_server_iov {
u32 cmd;
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index feb77b53b93d..b9f1b8c507c7 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -6,11 +6,11 @@
#include <sys/mman.h>
#include "protobuf.h"
-#include "protobuf/sa.pb-c.h"
-#include "protobuf/timer.pb-c.h"
-#include "protobuf/creds.pb-c.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/pagemap.pb-c.h"
+#include "images/sa.pb-c.h"
+#include "images/timer.pb-c.h"
+#include "images/creds.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/pagemap.pb-c.h"
#include "imgset.h"
#include "ptrace.h"
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 8cec7f9c419b..5bcae4f4913f 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -32,8 +32,8 @@
#include "aio.h"
#include "seccomp.h"
-#include "protobuf/creds.pb-c.h"
-#include "protobuf/mm.pb-c.h"
+#include "images/creds.pb-c.h"
+#include "images/mm.pb-c.h"
#include "asm/restorer.h"
diff --git a/criu/pipes.c b/criu/pipes.c
index a1552127837f..f4abdb67e648 100644
--- a/criu/pipes.c
+++ b/criu/pipes.c
@@ -12,8 +12,8 @@
#include "util-pie.h"
#include "protobuf.h"
-#include "protobuf/pipe.pb-c.h"
-#include "protobuf/pipe-data.pb-c.h"
+#include "images/pipe.pb-c.h"
+#include "images/pipe-data.pb-c.h"
static LIST_HEAD(pipes);
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index c7c577554bae..9825da917029 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -33,8 +33,8 @@
#include "files-reg.h"
#include "protobuf.h"
-#include "protobuf/fdinfo.pb-c.h"
-#include "protobuf/mnt.pb-c.h"
+#include "images/fdinfo.pb-c.h"
+#include "images/mnt.pb-c.h"
#include <stdlib.h>
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index c80ebb794671..511d3493e319 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -15,54 +15,54 @@
#include "protobuf-desc.h"
-#include "protobuf/inventory.pb-c.h"
-#include "protobuf/stats.pb-c.h"
-#include "protobuf/regfile.pb-c.h"
-#include "protobuf/ext-file.pb-c.h"
-#include "protobuf/ns.pb-c.h"
-#include "protobuf/eventfd.pb-c.h"
-#include "protobuf/eventpoll.pb-c.h"
-#include "protobuf/signalfd.pb-c.h"
-#include "protobuf/fsnotify.pb-c.h"
-#include "protobuf/core.pb-c.h"
-#include "protobuf/mm.pb-c.h"
-#include "protobuf/pipe.pb-c.h"
-#include "protobuf/fifo.pb-c.h"
-#include "protobuf/fdinfo.pb-c.h"
-#include "protobuf/pipe-data.pb-c.h"
-#include "protobuf/pstree.pb-c.h"
-#include "protobuf/sa.pb-c.h"
-#include "protobuf/sk-unix.pb-c.h"
-#include "protobuf/sk-inet.pb-c.h"
-#include "protobuf/packet-sock.pb-c.h"
-#include "protobuf/sk-packet.pb-c.h"
-#include "protobuf/creds.pb-c.h"
-#include "protobuf/timer.pb-c.h"
-#include "protobuf/utsns.pb-c.h"
-#include "protobuf/ipc-var.pb-c.h"
-#include "protobuf/ipc-shm.pb-c.h"
-#include "protobuf/ipc-msg.pb-c.h"
-#include "protobuf/ipc-sem.pb-c.h"
-#include "protobuf/fs.pb-c.h"
-#include "protobuf/remap-file-path.pb-c.h"
-#include "protobuf/ghost-file.pb-c.h"
-#include "protobuf/mnt.pb-c.h"
-#include "protobuf/netdev.pb-c.h"
-#include "protobuf/tcp-stream.pb-c.h"
-#include "protobuf/tty.pb-c.h"
-#include "protobuf/file-lock.pb-c.h"
-#include "protobuf/rlimit.pb-c.h"
-#include "protobuf/pagemap.pb-c.h"
-#include "protobuf/siginfo.pb-c.h"
-#include "protobuf/sk-netlink.pb-c.h"
-#include "protobuf/vma.pb-c.h"
-#include "protobuf/tun.pb-c.h"
-#include "protobuf/cgroup.pb-c.h"
-#include "protobuf/timerfd.pb-c.h"
-#include "protobuf/cpuinfo.pb-c.h"
-#include "protobuf/userns.pb-c.h"
-#include "protobuf/seccomp.pb-c.h"
-#include "protobuf/binfmt-misc.pb-c.h"
+#include "images/inventory.pb-c.h"
+#include "images/stats.pb-c.h"
+#include "images/regfile.pb-c.h"
+#include "images/ext-file.pb-c.h"
+#include "images/ns.pb-c.h"
+#include "images/eventfd.pb-c.h"
+#include "images/eventpoll.pb-c.h"
+#include "images/signalfd.pb-c.h"
+#include "images/fsnotify.pb-c.h"
+#include "images/core.pb-c.h"
+#include "images/mm.pb-c.h"
+#include "images/pipe.pb-c.h"
+#include "images/fifo.pb-c.h"
+#include "images/fdinfo.pb-c.h"
+#include "images/pipe-data.pb-c.h"
+#include "images/pstree.pb-c.h"
+#include "images/sa.pb-c.h"
+#include "images/sk-unix.pb-c.h"
+#include "images/sk-inet.pb-c.h"
+#include "images/packet-sock.pb-c.h"
+#include "images/sk-packet.pb-c.h"
+#include "images/creds.pb-c.h"
+#include "images/timer.pb-c.h"
+#include "images/utsns.pb-c.h"
+#include "images/ipc-var.pb-c.h"
+#include "images/ipc-shm.pb-c.h"
+#include "images/ipc-msg.pb-c.h"
+#include "images/ipc-sem.pb-c.h"
+#include "images/fs.pb-c.h"
+#include "images/remap-file-path.pb-c.h"
+#include "images/ghost-file.pb-c.h"
+#include "images/mnt.pb-c.h"
+#include "images/netdev.pb-c.h"
+#include "images/tcp-stream.pb-c.h"
+#include "images/tty.pb-c.h"
+#include "images/file-lock.pb-c.h"
+#include "images/rlimit.pb-c.h"
+#include "images/pagemap.pb-c.h"
+#include "images/siginfo.pb-c.h"
+#include "images/sk-netlink.pb-c.h"
+#include "images/vma.pb-c.h"
+#include "images/tun.pb-c.h"
+#include "images/cgroup.pb-c.h"
+#include "images/timerfd.pb-c.h"
+#include "images/cpuinfo.pb-c.h"
+#include "images/userns.pb-c.h"
+#include "images/seccomp.pb-c.h"
+#include "images/binfmt-misc.pb-c.h"
struct cr_pb_message_desc cr_pb_descs[PB_MAX];
diff --git a/criu/pstree.c b/criu/pstree.c
index 06bc5f84b5be..7eb18e396913 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -14,7 +14,7 @@
#include "asm/dump.h"
#include "protobuf.h"
-#include "protobuf/pstree.pb-c.h"
+#include "images/pstree.pb-c.h"
struct pstree_item *root_item;
diff --git a/criu/seccomp.c b/criu/seccomp.c
index 9fd545d677b6..69c4dfc3d2c6 100644
--- a/criu/seccomp.c
+++ b/criu/seccomp.c
@@ -15,7 +15,7 @@
#include "rst-malloc.h"
#include "protobuf.h"
-#include "protobuf/seccomp.pb-c.h"
+#include "images/seccomp.pb-c.h"
/* populated on dump during collect_seccomp_filters() */
static int next_filter_id = 0;
diff --git a/criu/shmem.c b/criu/shmem.c
index ad3cdbbdeedd..39de0eca13c9 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -15,7 +15,7 @@
#include "config.h"
#include "protobuf.h"
-#include "protobuf/pagemap.pb-c.h"
+#include "images/pagemap.pb-c.h"
/*
* pid is a pid of a creater
diff --git a/criu/sigframe.c b/criu/sigframe.c
index 448749320231..fb1efdcd27a4 100644
--- a/criu/sigframe.c
+++ b/criu/sigframe.c
@@ -4,7 +4,7 @@
#include "asm/restore.h"
#include "asm/restorer.h"
-#include "protobuf/core.pb-c.h"
+#include "images/core.pb-c.h"
int construct_sigframe(struct rt_sigframe *sigframe,
struct rt_sigframe *rsigframe,
diff --git a/criu/signalfd.c b/criu/signalfd.c
index 6d686d44c443..4ffc195dafb7 100644
--- a/criu/signalfd.c
+++ b/criu/signalfd.c
@@ -13,7 +13,7 @@
#include "files.h"
#include "protobuf.h"
-#include "protobuf/signalfd.pb-c.h"
+#include "images/signalfd.pb-c.h"
struct signalfd_info {
SignalfdEntry *sfe;
diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index a98b26dc82b4..67cb6814d7a1 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -8,7 +8,7 @@
#include "util.h"
#include "protobuf.h"
-#include "protobuf/sk-netlink.pb-c.h"
+#include "images/sk-netlink.pb-c.h"
#include "netlink_diag.h"
#include "libnetlink.h"
diff --git a/criu/sk-packet.c b/criu/sk-packet.c
index a296dfa16a7f..7573859e62b4 100644
--- a/criu/sk-packet.c
+++ b/criu/sk-packet.c
@@ -15,8 +15,8 @@
#include <arpa/inet.h>
#include "protobuf.h"
-#include "protobuf/packet-sock.pb-c.h"
-#include "protobuf/fdinfo.pb-c.h"
+#include "images/packet-sock.pb-c.h"
+#include "images/fdinfo.pb-c.h"
struct packet_sock_info {
PacketSockEntry *pse;
diff --git a/criu/sk-queue.c b/criu/sk-queue.c
index 6a39c4b35a8c..ecfe8fb7d5bc 100644
--- a/criu/sk-queue.c
+++ b/criu/sk-queue.c
@@ -23,7 +23,7 @@
#include "sk-queue.h"
#include "protobuf.h"
-#include "protobuf/sk-packet.pb-c.h"
+#include "images/sk-packet.pb-c.h"
struct sk_packet {
struct list_head list;
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index f653446a3604..e4fd843ac65a 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -26,7 +26,7 @@
#include "rst-malloc.h"
#include "protobuf.h"
-#include "protobuf/tcp-stream.pb-c.h"
+#include "images/tcp-stream.pb-c.h"
#ifndef SIOCOUTQNSD
/* MAO - Define SIOCOUTQNSD ioctl if we don't have it */
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 608eb3eb3376..96aa68903bd6 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -29,7 +29,7 @@
#include "pstree.h"
#include "protobuf.h"
-#include "protobuf/sk-unix.pb-c.h"
+#include "images/sk-unix.pb-c.h"
#undef LOG_PREFIX
#define LOG_PREFIX "sk unix: "
diff --git a/criu/stats.c b/criu/stats.c
index 2a80bb31bc0a..6b636d437a45 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -5,7 +5,7 @@
#include "protobuf.h"
#include "stats.h"
#include "image.h"
-#include "protobuf/stats.pb-c.h"
+#include "images/stats.pb-c.h"
struct timing {
struct timeval start;
diff --git a/criu/timerfd.c b/criu/timerfd.c
index 019de69ef61b..942e5e6a05e1 100644
--- a/criu/timerfd.c
+++ b/criu/timerfd.c
@@ -6,7 +6,7 @@
#include <sys/ioctl.h>
#include "protobuf.h"
-#include "protobuf/timerfd.pb-c.h"
+#include "images/timerfd.pb-c.h"
#include "proc_parse.h"
#include "rst-malloc.h"
diff --git a/criu/tty.c b/criu/tty.c
index ef82583ddfd6..ba44af6e033a 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -30,7 +30,7 @@
#include "namespaces.h"
#include "protobuf.h"
-#include "protobuf/tty.pb-c.h"
+#include "images/tty.pb-c.h"
#include "parasite-syscall.h"
#include "parasite.h"
diff --git a/criu/tun.c b/criu/tun.c
index dcee704e48b4..94ccb6cb8c7c 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -19,7 +19,7 @@
#include "net.h"
#include "namespaces.h"
-#include "protobuf/tun.pb-c.h"
+#include "images/tun.pb-c.h"
#ifndef IFF_PERSIST
#define IFF_PERSIST 0x0800
diff --git a/criu/uts_ns.c b/criu/uts_ns.c
index ed64d77ec467..1ea075cbdd1c 100644
--- a/criu/uts_ns.c
+++ b/criu/uts_ns.c
@@ -10,7 +10,7 @@
#include "uts_ns.h"
#include "protobuf.h"
-#include "protobuf/utsns.pb-c.h"
+#include "images/utsns.pb-c.h"
int dump_uts_ns(int ns_id)
{
diff --git a/protobuf b/protobuf
deleted file mode 120000
index 5e798fa0ef25..000000000000
--- a/protobuf
+++ /dev/null
@@ -1 +0,0 @@
-images
\ No newline at end of file
--
2.5.0
More information about the CRIU
mailing list