Skip to content

cr-service: skip dump&restore specific optons when doing check #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
herheliuk wants to merge 1 commit into from
Closed

cr-service: skip dump&restore specific optons when doing check #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions criu/cr-service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
xfree(tmp_work);
}

if (opts.mode == CR_CHECK)
goto after_dump_restore_specific;

/*
* open images_dir - images_dir_fd is a required RPC parameter
*
Expand Down Expand Up @@ -733,6 +736,8 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
goto err;
}

after_dump_restore_specific:

if (req->n_irmap_scan_paths) {
for (i = 0; i < req->n_irmap_scan_paths; i++) {
if (irmap_scan_path_add(req->irmap_scan_paths[i]))
Expand Down
2 changes: 2 additions & 0 deletions lib/pycriu/criu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ def check(self):
"""
req = rpc.criu_req()
req.type = rpc.CHECK
req.opts.MergeFrom(self.opts)
req.opts.images_dir_fd = self.opts.images_dir_fd

resp = self._send_req_and_recv_resp(req)

Expand Down
Loading