[CRIU] [PATCH 4/6] compel: Prepare to ship common headers into compel

[Pavel Emelyanov]

On 11/16/2016 06:06 PM, Cyrill Gorcunov wrote:
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h | 2 +-
>  compel/arch/arm/src/lib/include/uapi/asm/infect-types.h     | 2 +-
>  compel/arch/x86/src/lib/include/uapi/asm/fpu.h              | 2 +-
>  compel/arch/x86/src/lib/include/uapi/asm/infect-types.h     | 2 +-
>  compel/include/uapi/common                                  | 1 +
>  compel/plugins/include/uapi/plugin-fds.h                    | 2 +-
>  6 files changed, 6 insertions(+), 5 deletions(-)
>  create mode 120000 compel/include/uapi/common
> 
> diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
> index 7bc195b14d92..8a66e5376a4f 100644
> --- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
> +++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
> @@ -5,7 +5,7 @@
>  #include <signal.h>
>  #include <sys/mman.h>
>  #include <asm/ptrace.h>
> -#include "common/page.h"
> +#include <compel/common/asm/page.h>

Don't carry common/page.h into install, we've discussed that. The only
reason for page.h is here is task_size() routine that has to be moved
into .c of the libcompel, so the whole common/page.h goes away from uapi
headers.

>  #define SIGMAX			64
>  #define SIGMAX_OLD		31
> diff --git a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
> index 1df9f6836069..5a07ce0b5ec7 100644
> --- a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
> +++ b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
> @@ -3,7 +3,7 @@
>  
>  #include <stdint.h>
>  #include <sys/mman.h>
> -#include "common/page.h"
> +#include <compel/common/asm/page.h>
>  
>  #define SIGMAX			64
>  #define SIGMAX_OLD		31
> diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
> index 90071a1445b5..7525f153a7e1 100644
> --- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
> +++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
> @@ -5,7 +5,7 @@
>  #include <stdbool.h>
>  #include <stdint.h>
>  
> -#include "common/compiler.h"
> +#include <compel/common/compiler.h>
>  
>  #define FP_MIN_ALIGN_BYTES		64
>  
> diff --git a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
> index dc574c304733..893bf2feee4d 100644
> --- a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
> +++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
> @@ -4,7 +4,7 @@
>  #include <stdint.h>
>  #include <stdbool.h>
>  #include <signal.h>
> -#include "common/page.h"
> +#include <compel/common/asm/page.h>
>  #include <compel/plugins/std/asm/syscall-types.h>
>  
>  #define SIGMAX			64
> diff --git a/compel/include/uapi/common b/compel/include/uapi/common
> new file mode 120000
> index 000000000000..33f00f44a257
> --- /dev/null
> +++ b/compel/include/uapi/common
> @@ -0,0 +1 @@
> +../../../include/common
> \ No newline at end of file
> diff --git a/compel/plugins/include/uapi/plugin-fds.h b/compel/plugins/include/uapi/plugin-fds.h
> index 4d2feedb3965..fbf5313a81be 100644
> --- a/compel/plugins/include/uapi/plugin-fds.h
> +++ b/compel/plugins/include/uapi/plugin-fds.h
> @@ -7,6 +7,6 @@
>  
>  #include <sys/un.h>
>  
> -#include "common/scm.h"
> +#include <compel/common/scm.h>
>  
>  #endif /* __COMPEL_PLUGIN_FDS_H__ */
>