criu: Remove compel.h includes

The plan is to remove "compel.h". That file only includes other headers
(which may be not needed). If we aim for one-include-for-compel, we
could instead paste all subheaders into "compel.h".
Rather, I think it's worth to migrate to more fine-grained compel
headers than follow the strategy 'one header to rule them all'.

Further, the header creates problems for cross-compilation: it's
included in files, those are used by host-compel. Which rightfully
confuses compiler/linker as host's definitions for fpu regs/other
platform details get drained into host's compel.

As a first step - stop including "compel.h" in criu.

Signed-off-by: Dmitry Safonov <dima@arista.com>

criu/aio.c

@@ -11,7 +11,7 @@
 #include "parasite.h"
 #include "parasite-syscall.h"
 #include "images/mm.pb-c.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define NR_IOEVENTS_IN_NPAGES(npages) ((PAGE_SIZE * (npages) - sizeof(struct aio_ring)) / sizeof(struct io_event))
 

criu/arch/aarch64/crtools.c

@@ -19,7 +19,7 @@
 #include "util.h"
 #include "cpu.h"
 #include "restorer.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))(src)->e
 

criu/arch/arm/crtools.c

@@ -18,8 +18,7 @@
 #include "elf.h"
 #include "parasite-syscall.h"
 #include "restorer.h"
-
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))((src)->ARM_##e)
 

criu/arch/ppc64/crtools.c

@@ -17,7 +17,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"

criu/arch/s390/crtools.c

@@ -17,7 +17,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"

criu/arch/x86/crtools.c

@@ -1,5 +1,5 @@
 #include "compel/asm/fpu.h"
-#include "compel/compel.h"
+#include "compel/infect.h"
 #include "compel/plugins/std/syscall-codes.h"
 #include "cpu.h"
 #include "cr_options.h"

criu/arch/x86/sys-exec-tbl.c

@@ -1,4 +1,3 @@
-#include <compel/compel.h>
 
 static struct syscall_exec_desc sc_exec_table_64[] = {
 #include "sys-exec-tbl-64.c"

criu/cr-restore.c

@@ -67,7 +67,6 @@
 #include "timerfd.h"
 #include "action-scripts.h"
 #include "shmem.h"
-#include <compel/compel.h>
 #include "aio.h"
 #include "lsm.h"
 #include "seccomp.h"

criu/include/proc_parse.h

@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define PROC_TASK_COMM_LEN	32
 #define PROC_TASK_COMM_LEN_FMT	"(%31s"

criu/kerndat.c

@@ -33,7 +33,6 @@
 #include "net.h"
 #include "tun.h"
 #include <compel/plugins/std/syscall-codes.h>
-#include <compel/compel.h>
 #include "netfilter.h"
 #include "fsnotify.h"
 #include "linux/userfaultfd.h"

criu/mem.c

@@ -29,7 +29,7 @@
 #include "pagemap-cache.h"
 #include "fault-injection.h"
 #include "prctl.h"
-#include <compel/compel.h>
+#include "compel/infect-util.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"

criu/parasite-syscall.c

@@ -45,8 +45,6 @@
 #include "infect-rpc.h"
 #include "pie/parasite-blob.h"
 
-#include <compel/compel.h>
-
 unsigned long get_exec_start(struct vm_area_list *vmas)
 {
 	struct vma_area *vma_area;

criu/pie/pie-relocs.h

@@ -1,8 +1,6 @@
 #ifndef __PIE_RELOCS_H__
 #define __PIE_RELOCS_H__
 
-#include <compel/compel.h>
-
 #include "common/config.h"
 #include "common/compiler.h"
 

criu/seize.c

@@ -23,7 +23,6 @@
 #include "string.h"
 #include "xmalloc.h"
 #include "util.h"
-#include <compel/compel.h>
 
 #define NR_ATTEMPTS 5
 

criu/vdso.c

@@ -20,7 +20,6 @@
 #include "criu-log.h"
 #include "mem.h"
 #include "vma.h"
-#include <compel/compel.h>
 #include <compel/plugins/std/syscall.h>
 
 #ifdef LOG_PREFIX