From 3efe44382fef816ea274ed1833adc1abfa4b4f06 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sun, 6 Oct 2019 01:01:50 +0300 Subject: [PATCH] image: avoid name conflicts in image files 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 --- criu/cr-service.c | 2 +- images/rpc.proto | 2 +- test/zdtm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/criu/cr-service.c b/criu/cr-service.c index 392e9ac50..a70f99d71 100644 --- a/criu/cr-service.c +++ b/criu/cr-service.c @@ -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: diff --git a/images/rpc.proto b/images/rpc.proto index fc2f1bce2..df1b5aed2 100644 --- a/images/rpc.proto +++ b/images/rpc.proto @@ -49,7 +49,7 @@ enum criu_cg_mode { enum criu_pre_dump_mode { SPLICE = 1; - READ = 2; + VM_READ = 2; }; message criu_opts { diff --git a/test/zdtm.py b/test/zdtm.py index 571962241..6d3fddfad 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -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