From 5e75d49946bd4c96edb02003ce4fc6bdea5fb54b Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 30 Sep 2016 14:58:29 +0300 Subject: [PATCH] infect: Move sigmask getter (from ctl) into infec.c ... and hide compel priv from parasite-syscall. Now it's completely isolated inside compel. Signed-off-by: Pavel Emelyanov Signed-off-by: Andrei Vagin --- criu/include/infect.h | 2 ++ criu/infect.c | 5 +++++ criu/parasite-syscall.c | 3 +-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/criu/include/infect.h b/criu/include/infect.h index 8335127d8..973913d21 100644 --- a/criu/include/infect.h +++ b/criu/include/infect.h @@ -79,4 +79,6 @@ extern int compel_unmap(struct parasite_ctl *ctl, unsigned long addr); extern int compel_mode_native(struct parasite_ctl *ctl); +extern k_rtsigset_t *compel_task_sigmask(struct parasite_ctl *ctl); + #endif diff --git a/criu/infect.c b/criu/infect.c index 8e5d5714a..a7c03df58 100644 --- a/criu/infect.c +++ b/criu/infect.c @@ -1211,3 +1211,8 @@ int compel_mode_native(struct parasite_ctl *ctl) { return user_regs_native(&ctl->orig.regs); } + +k_rtsigset_t *compel_task_sigmask(struct parasite_ctl *ctl) +{ + return &ctl->orig.sigmask; +} diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c index db0436b11..5f816a734 100644 --- a/criu/parasite-syscall.c +++ b/criu/parasite-syscall.c @@ -43,7 +43,6 @@ #include "infect.h" #include "infect-rpc.h" -#include "infect-priv.h" unsigned long get_exec_start(struct vm_area_list *vmas) { @@ -597,7 +596,7 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item, } parasite_args_size = PARASITE_ARG_SIZE_MIN; /* reset for next task */ - memcpy(&item->core[0]->tc->blk_sigset, &ctl->orig.sigmask, sizeof(k_rtsigset_t)); + memcpy(&item->core[0]->tc->blk_sigset, compel_task_sigmask(ctl), sizeof(k_rtsigset_t)); dmpi(item)->parasite_ctl = ctl; return ctl;