From 327554ee646ac8c7728981d0607dc42420c3a85a Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 5 Mar 2020 15:00:08 +0000
Subject: [PATCH] compel: Remove compel.h

The 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.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 Documentation/compel.txt                 |  2 +-
 compel/arch/aarch64/src/lib/handle-elf.c |  3 +--
 compel/arch/arm/src/lib/handle-elf.c     |  3 +--
 compel/arch/arm/src/lib/infect.c         |  1 +
 compel/arch/ppc64/src/lib/cpu.c          |  1 +
 compel/arch/ppc64/src/lib/handle-elf.c   |  3 +--
 compel/arch/s390/src/lib/handle-elf.c    |  3 +--
 compel/arch/s390/src/lib/infect.c        |  1 +
 compel/arch/x86/src/lib/handle-elf.c     |  3 +--
 compel/arch/x86/src/lib/infect.c         |  1 +
 compel/include/log.h                     |  3 +--
 compel/include/uapi/compel.h             | 14 --------------
 compel/src/lib/handle-elf.c              |  6 ++----
 compel/src/lib/log.c                     |  3 ---
 compel/src/main.c                        |  2 --
 compel/test/fdspy/spy.c                  |  1 -
 compel/test/infect/spy.c                 |  1 -
 compel/test/rsys/spy.c                   |  2 --
 include/common/scm.h                     |  2 ++
 19 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 compel/include/uapi/compel.h

diff --git a/Documentation/compel.txt b/Documentation/compel.txt
index 744a3b35d..6ccd20861 100644
--- a/Documentation/compel.txt
+++ b/Documentation/compel.txt
@@ -86,7 +86,7 @@ Infecting code
 ~~~~~~~~~~~~~~
 The parasitic code is compiled and converted to a header using *compel*, and included here.
 
-*#include <compel/compel.h>*
+*#include <compel/infect.h>*
 
 *#include "parasite.h"*
 
diff --git a/compel/arch/aarch64/src/lib/handle-elf.c b/compel/arch/aarch64/src/lib/handle-elf.c
index 1c3686c48..1ee65ee2c 100644
--- a/compel/arch/aarch64/src/lib/handle-elf.c
+++ b/compel/arch/aarch64/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/arm/src/lib/handle-elf.c b/compel/arch/arm/src/lib/handle-elf.c
index 8abf8dad1..5b8d00a6f 100644
--- a/compel/arch/arm/src/lib/handle-elf.c
+++ b/compel/arch/arm/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index c17cb9c9b..0053bef58 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
+#include <string.h>
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/processor-flags.h>
 #include "common/page.h"
diff --git a/compel/arch/ppc64/src/lib/cpu.c b/compel/arch/ppc64/src/lib/cpu.c
index 338ab4891..7a3972790 100644
--- a/compel/arch/ppc64/src/lib/cpu.c
+++ b/compel/arch/ppc64/src/lib/cpu.c
@@ -2,6 +2,7 @@
 #include <asm/cputable.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <string.h>
 
 #include "compel-cpu.h"
 
diff --git a/compel/arch/ppc64/src/lib/handle-elf.c b/compel/arch/ppc64/src/lib/handle-elf.c
index 3d4020f59..f29fdc8a3 100644
--- a/compel/arch/ppc64/src/lib/handle-elf.c
+++ b/compel/arch/ppc64/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/s390/src/lib/handle-elf.c b/compel/arch/s390/src/lib/handle-elf.c
index 01a8bf4c8..6ed382c92 100644
--- a/compel/arch/s390/src/lib/handle-elf.c
+++ b/compel/arch/s390/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 7e7d24ce2..5a4675449 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <elf.h>
 #include <compel/plugins/std/syscall-codes.h>
diff --git a/compel/arch/x86/src/lib/handle-elf.c b/compel/arch/x86/src/lib/handle-elf.c
index 62fb28f49..938999b2e 100644
--- a/compel/arch/x86/src/lib/handle-elf.c
+++ b/compel/arch/x86/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 11e7f4c91..9c4abb60c 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -3,6 +3,7 @@
 #include <sys/auxv.h>
 #include <sys/mman.h>
 #include <sys/user.h>
+#include <errno.h>
 
 #include <compel/asm/fpu.h>
 
diff --git a/compel/include/log.h b/compel/include/log.h
index 559f909ce..49e65bb50 100644
--- a/compel/include/log.h
+++ b/compel/include/log.h
@@ -1,8 +1,7 @@
 #ifndef COMPEL_LOG_H__
 #define COMPEL_LOG_H__
 
-#include "uapi/compel/compel.h"
-#include "uapi/compel/loglevels.h"
+#include "uapi/compel/log.h"
 
 #ifndef LOG_PREFIX
 # define LOG_PREFIX
diff --git a/compel/include/uapi/compel.h b/compel/include/uapi/compel.h
deleted file mode 100644
index 318a472da..000000000
--- a/compel/include/uapi/compel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef UAPI_COMPEL_H__
-#define UAPI_COMPEL_H__
-
-#include <errno.h>
-#include <stdarg.h>
-
-#include <compel/asm/infect-types.h>
-#include <compel/handle-elf.h>
-#include <compel/log.h>
-#include <compel/infect-util.h>
-#include <compel/infect-rpc.h>
-#include <compel/infect.h>
-
-#endif /* UAPI_COMPEL_H__ */
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index ca7c53b71..69d5104b6 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdint.h>
+#include <errno.h>
 
 #include <fcntl.h>
 
@@ -12,8 +12,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "uapi/compel.h"
-
 #include "handle-elf.h"
 #include "piegen.h"
 #include "log.h"
@@ -228,7 +226,7 @@ int __handle_elf(void *mem, size_t size)
 	}
 
 	pr_out("/* Autogenerated from %s */\n", opts.input_filename);
-	pr_out("#include <compel/compel.h>\n");
+	pr_out("#include <compel/infect.h>\n");
 
 	for (i = 0; i < symtab_hdr->sh_size / symtab_hdr->sh_entsize; i++) {
 		Elf_Sym *sym = &symbols[i];
diff --git a/compel/src/lib/log.c b/compel/src/lib/log.c
index d195343e4..c86be02c5 100644
--- a/compel/src/lib/log.c
+++ b/compel/src/lib/log.c
@@ -4,11 +4,8 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <unistd.h>
-
 #include <fcntl.h>
 
-#include <compel/compel.h>
-
 #include "log.h"
 
 static unsigned int current_loglevel = COMPEL_DEFAULT_LOGLEVEL;
diff --git a/compel/src/main.c b/compel/src/main.c
index 8b2c8bc8d..36127c357 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -13,8 +13,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "uapi/compel/compel.h"
-
 #include "version.h"
 #include "piegen.h"
 #include "log.h"
diff --git a/compel/test/fdspy/spy.c b/compel/test/fdspy/spy.c
index 258e3ab75..1a373b6bb 100644
--- a/compel/test/fdspy/spy.c
+++ b/compel/test/fdspy/spy.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
-#include <compel/compel.h>
 #include "parasite.h"
 
 #define PARASITE_CMD_GETFD	PARASITE_USER_CMDS
diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index a5aba7308..b5f8b2559 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
-#include <compel/compel.h>
 #include "parasite.h"
 
 #define PARASITE_CMD_INC	PARASITE_USER_CMDS
diff --git a/compel/test/rsys/spy.c b/compel/test/rsys/spy.c
index f5c999d5a..98654efcf 100644
--- a/compel/test/rsys/spy.c
+++ b/compel/test/rsys/spy.c
@@ -4,8 +4,6 @@
 #include <sys/wait.h>
 #include <sys/syscall.h>
 
-#include <compel/compel.h>
-
 static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 {
 	printf("\tLC%u: ", lvl);
diff --git a/include/common/scm.h b/include/common/scm.h
index ab27137b8..a8eb9ec4c 100644
--- a/include/common/scm.h
+++ b/include/common/scm.h
@@ -3,7 +3,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 
 /*
  * Because of kernel doing kmalloc for user data passed