mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

pages: Rename parasite args->nr to args->nr_segs

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2013-05-13 23:05:37 +04:00
parent c15d4ee66a
commit eb41d26d4a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/parasite.h
View File

@@ -68,7 +68,7 @@ struct parasite_mprotect_args
struct parasite_dump_pages_args { struct parasite_dump_pages_args {
unsigned int off; unsigned int off;
unsigned int nr; unsigned int nr_segs;
unsigned int nr_pages; unsigned int nr_pages;
struct iovec iovs[0]; struct iovec iovs[0];
}; };

6
mem.c
View File

@@ -349,16 +349,16 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
if (ret) if (ret)
goto out_pp; goto out_pp;
args->nr = ppb->nr_segs; args->nr_segs = ppb->nr_segs;
args->nr_pages = ppb->pages_in; args->nr_pages = ppb->pages_in;
pr_debug("PPB: %d pages %d segs %u pipe %d off\n", pr_debug("PPB: %d pages %d segs %u pipe %d off\n",
args->nr_pages, args->nr, ppb->pipe_size, args->off); args->nr_pages, args->nr_segs, ppb->pipe_size, args->off);
ret = parasite_execute(PARASITE_CMD_DUMPPAGES, ctl); ret = parasite_execute(PARASITE_CMD_DUMPPAGES, ctl);
if (ret < 0) if (ret < 0)
goto out_pp; goto out_pp;
args->off += args->nr; args->off += args->nr_segs;
} }
ret = open_page_xfer(&xfer, CR_FD_PAGEMAP, ctl->pid.virt); ret = open_page_xfer(&xfer, CR_FD_PAGEMAP, ctl->pid.virt);

2
pie/parasite.c
View File

@@ -60,7 +60,7 @@ static int dump_pages(struct parasite_dump_pages_args *args)
if (p < 0) if (p < 0)
return -1; return -1;
ret = sys_vmsplice(p, &args->iovs[args->off], args->nr, ret = sys_vmsplice(p, &args->iovs[args->off], args->nr_segs,
SPLICE_F_GIFT | SPLICE_F_NONBLOCK); SPLICE_F_GIFT | SPLICE_F_NONBLOCK);
if (ret != PAGE_SIZE * args->nr_pages) { if (ret != PAGE_SIZE * args->nr_pages) {
sys_close(p); sys_close(p);