Commit 51092282 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin

compel: Move sigframe code into compel

We use it in both -- parasite engine and criu,
so export them as well.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent fd814de1
...@@ -21,7 +21,7 @@ struct aux_context { ...@@ -21,7 +21,7 @@ struct aux_context {
// XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code // XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
#define rt_sigcontext sigcontext #define rt_sigcontext sigcontext
#include "sigframe-common.h" #include <compel/sigframe-common.h>
/* Copied from the kernel source arch/arm64/kernel/signal.c */ /* Copied from the kernel source arch/arm64/kernel/signal.c */
......
...@@ -51,7 +51,7 @@ struct aux_sigframe { ...@@ -51,7 +51,7 @@ struct aux_sigframe {
unsigned long end_magic; unsigned long end_magic;
} __attribute__((aligned(8))); } __attribute__((aligned(8)));
#include "sigframe-common.h" #include <compel/sigframe-common.h>
struct sigframe { struct sigframe {
struct rt_ucontext uc; struct rt_ucontext uc;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
// XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code // XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
#define rt_sigcontext sigcontext #define rt_sigcontext sigcontext
#include "sigframe-common.h" #include <compel/sigframe-common.h>
#define RT_SIGFRAME_OFFSET(rt_sigframe) 0 #define RT_SIGFRAME_OFFSET(rt_sigframe) 0
......
...@@ -66,7 +66,7 @@ struct rt_sigcontext_32 { ...@@ -66,7 +66,7 @@ struct rt_sigcontext_32 {
uint32_t cr2; uint32_t cr2;
}; };
#include "sigframe-common.h" #include <compel/sigframe-common.h>
/* /*
* XXX: move declarations to generic sigframe.h or sigframe-compat.h * XXX: move declarations to generic sigframe.h or sigframe-compat.h
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "asm/types.h" #include "asm/types.h"
#include "images/core.pb-c.h" #include "images/core.pb-c.h"
#include "sigframe.h" #include <compel/asm/sigframe.h>
#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \ #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \
thread_args, clone_restore_fn) \ thread_args, clone_restore_fn) \
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "asm/types.h" #include "asm/types.h"
#include "images/core.pb-c.h" #include "images/core.pb-c.h"
#include "sigframe.h" #include <compel/asm/sigframe.h>
#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \ #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \
thread_args, clone_restore_fn) \ thread_args, clone_restore_fn) \
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "asm/types.h" #include "asm/types.h"
#include "asm/infect-types.h" #include "asm/infect-types.h"
#include "sigframe.h" #include <compel/asm/sigframe.h>
/* /*
* Clone trampoline * Clone trampoline
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "images/core.pb-c.h" #include "images/core.pb-c.h"
#include <compel/plugins/std/syscall-codes.h> #include <compel/plugins/std/syscall-codes.h>
#include "sigframe.h" #include <compel/asm/sigframe.h>
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
extern void *alloc_compat_syscall_stack(void); extern void *alloc_compat_syscall_stack(void);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef __CR_SIGFRAME_H__ #ifndef __CR_SIGFRAME_H__
#define __CR_SIGFRAME_H__ #define __CR_SIGFRAME_H__
#include "asm/sigframe.h" #include <compel/asm/sigframe.h>
#include "images/core.pb-c.h" #include "images/core.pb-c.h"
extern int construct_sigframe(struct rt_sigframe *sigframe, extern int construct_sigframe(struct rt_sigframe *sigframe,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment