Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

image: avoid name conflicts in image files

Browse source 
Conflict register for file "sk-opts.proto": READ is already defined in
file "rpc.proto". Please fix the conflict by adding package name on the
proto file, or use different name for the duplication.  Note: enum
values appear as siblings of the enum type instead of children of it.

https://github.com/checkpoint-restore/criu/issues/815
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin 2019-10-06 01:01:50 +03:00
parent 6b264f591f
commit 3efe44382f
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
criu/cr-service.c
View file

@ -478,7 +478,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
case CRIU_PRE_DUMP_MODE__SPLICE:
opts.pre_dump_mode = PRE_DUMP_SPLICE;
break;
case CRIU_PRE_DUMP_MODE__READ:
case CRIU_PRE_DUMP_MODE__VM_READ:
opts.pre_dump_mode = PRE_DUMP_READ;
break;
default:

2
images/rpc.proto
View file

@ -49,7 +49,7 @@ enum criu_cg_mode {
enum criu_pre_dump_mode {
SPLICE = 1;
READ = 2;
VM_READ = 2;
};
message criu_opts {

2
test/zdtm.py
View file

@ -914,7 +914,7 @@ class criu_rpc:
continue
if arg == '--pre-dump-mode':
key = args.pop(0)
mode = crpc.rpc.READ
mode = crpc.rpc.VM_READ
if key == "splice":
mode = crpc.rpc.SPLICE
criu.opts.pre_dump_mode = mode