[CRIU] [PATCH 1/5] parasite-syscall: Move parasite_args macro to header

Cyrill Gorcunov gorcunov at openvz.org
Fri May 31 02:28:41 EDT 2013


It will be needed in x86/ code.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 include/parasite-syscall.h | 6 ++++++
 parasite-syscall.c         | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/parasite-syscall.h b/include/parasite-syscall.h
index 4a41228..34d4337 100644
--- a/include/parasite-syscall.h
+++ b/include/parasite-syscall.h
@@ -44,6 +44,12 @@ struct list_head;
 extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset);
 extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset);
 
+#define parasite_args(ctl, type)					\
+	({								\
+		BUILD_BUG_ON(sizeof(type) > PARASITE_ARG_SIZE_MIN);	\
+		ctl->addr_args;						\
+	})
+
 void *parasite_args_s(struct parasite_ctl *ctl, int args_size);
 int parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl);
 int parasite_send_fd(struct parasite_ctl *ctl, int fd);
diff --git a/parasite-syscall.c b/parasite-syscall.c
index ff9436c..e548e30 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -197,11 +197,6 @@ void *parasite_args_s(struct parasite_ctl *ctl, int args_size)
 	return ctl->addr_args;
 }
 
-#define parasite_args(ctl, type) ({				\
-		BUILD_BUG_ON(sizeof(type) > PARASITE_ARG_SIZE_MIN);\
-		ctl->addr_args;					\
-	})
-
 static int parasite_execute_trap_by_pid(unsigned int cmd,
 					struct parasite_ctl *ctl, pid_t pid,
 					user_regs_struct_t *regs_orig,
-- 
1.8.1.4



More information about the CRIU mailing list