Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
eb41d26d
Commit
eb41d26d
authored
May 13, 2013
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pages: Rename parasite args->nr to args->nr_segs
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
c15d4ee6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
parasite.h
include/parasite.h
+1
-1
mem.c
mem.c
+3
-3
parasite.c
pie/parasite.c
+1
-1
No files found.
include/parasite.h
View file @
eb41d26d
...
@@ -68,7 +68,7 @@ struct parasite_mprotect_args
...
@@ -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
];
};
};
...
...
mem.c
View file @
eb41d26d
...
@@ -349,16 +349,16 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
...
@@ -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
);
...
...
pie/parasite.c
View file @
eb41d26d
...
@@ -60,7 +60,7 @@ static int dump_pages(struct parasite_dump_pages_args *args)
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment