Commit 2e48f052 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Cyrill Gorcunov

crtools: Move options deeper into the code

I will need them in the place where we restore the root task.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 8e90a9e6
...@@ -1379,7 +1379,7 @@ static int restore_task_with_children(int pid) ...@@ -1379,7 +1379,7 @@ static int restore_task_with_children(int pid)
return restore_one_task(pid); return restore_one_task(pid);
} }
static int restore_root_task(int fd, bool detach) static int restore_root_task(int fd, struct cr_options *opts)
{ {
struct pstree_entry e; struct pstree_entry e;
int ret, i; int ret, i;
...@@ -1433,12 +1433,12 @@ static int restore_root_task(int fd, bool detach) ...@@ -1433,12 +1433,12 @@ static int restore_root_task(int fd, bool detach)
pr_info("Go on!!!\n"); pr_info("Go on!!!\n");
cr_wait_set(&task_entries->start, CR_STATE_COMPLETE); cr_wait_set(&task_entries->start, CR_STATE_COMPLETE);
if (!detach) if (!opts->restore_detach)
wait(NULL); wait(NULL);
return 0; return 0;
} }
static int restore_all_tasks(pid_t pid, bool detach) static int restore_all_tasks(pid_t pid, struct cr_options *opts)
{ {
int pstree_fd; int pstree_fd;
u32 type = 0; u32 type = 0;
...@@ -1450,7 +1450,7 @@ static int restore_all_tasks(pid_t pid, bool detach) ...@@ -1450,7 +1450,7 @@ static int restore_all_tasks(pid_t pid, bool detach)
if (prepare_shared(pstree_fd)) if (prepare_shared(pstree_fd))
return -1; return -1;
return restore_root_task(pstree_fd, detach); return restore_root_task(pstree_fd, opts);
} }
static long restorer_get_vma_hint(pid_t pid, struct list_head *self_vma_list, long vma_len) static long restorer_get_vma_hint(pid_t pid, struct list_head *self_vma_list, long vma_len)
...@@ -1891,5 +1891,5 @@ int cr_restore_tasks(pid_t pid, struct cr_options *opts) ...@@ -1891,5 +1891,5 @@ int cr_restore_tasks(pid_t pid, struct cr_options *opts)
if (opts->leader_only) if (opts->leader_only)
return restore_one_task(pid); return restore_one_task(pid);
return restore_all_tasks(pid, opts->restore_detach); return restore_all_tasks(pid, opts);
} }
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