diff --git a/images/binfmt-misc.proto b/images/binfmt-misc.proto index a6b2f8c47..82a86c8c9 100644 --- a/images/binfmt-misc.proto +++ b/images/binfmt-misc.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message binfmt_misc_entry { required string name = 1; required bool enabled = 2; diff --git a/images/cgroup.proto b/images/cgroup.proto index e4154f2ca..b8a545e3c 100644 --- a/images/cgroup.proto +++ b/images/cgroup.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message cgroup_perms { required uint32 mode = 1; required uint32 uid = 2; diff --git a/images/core-aarch64.proto b/images/core-aarch64.proto index dfcead9ad..725148989 100644 --- a/images/core-aarch64.proto +++ b/images/core-aarch64.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message user_aarch64_regs_entry { repeated uint64 regs = 1; required uint64 sp = 2; diff --git a/images/core-arm.proto b/images/core-arm.proto index 31d3a6142..9ff792be3 100644 --- a/images/core-arm.proto +++ b/images/core-arm.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message user_arm_regs_entry { required uint32 r0 = 1; required uint32 r1 = 2; diff --git a/images/core-ppc64.proto b/images/core-ppc64.proto index d61645305..5bdec9c07 100644 --- a/images/core-ppc64.proto +++ b/images/core-ppc64.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message user_ppc64_regs_entry { // Following is the list of regiters starting at r0. repeated uint64 gpr = 1; diff --git a/images/core-x86.proto b/images/core-x86.proto index f88ec06a0..a3fa1759e 100644 --- a/images/core-x86.proto +++ b/images/core-x86.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; message user_x86_regs_entry { diff --git a/images/core.proto b/images/core.proto index 824ee26e5..14f13f8b9 100644 --- a/images/core.proto +++ b/images/core.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "core-x86.proto"; import "core-arm.proto"; import "core-aarch64.proto"; diff --git a/images/cpuinfo.proto b/images/cpuinfo.proto index f5de73aa2..9fa34fbcb 100644 --- a/images/cpuinfo.proto +++ b/images/cpuinfo.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message cpuinfo_x86_entry { enum vendor { UNKNOWN = 0; diff --git a/images/creds.proto b/images/creds.proto index 1bf840513..29fb8652e 100644 --- a/images/creds.proto +++ b/images/creds.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message creds_entry { required uint32 uid = 1; required uint32 gid = 2; diff --git a/images/eventfd.proto b/images/eventfd.proto index cc3a7032f..ff9ced393 100644 --- a/images/eventfd.proto +++ b/images/eventfd.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "fown.proto"; message eventfd_file_entry { diff --git a/images/eventpoll.proto b/images/eventpoll.proto index c40675582..8901d807a 100644 --- a/images/eventpoll.proto +++ b/images/eventpoll.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "fown.proto"; message eventpoll_tfd_entry { diff --git a/images/ext-file.proto b/images/ext-file.proto index 82b1b689e..f820ffb07 100644 --- a/images/ext-file.proto +++ b/images/ext-file.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "fown.proto"; message ext_file_entry { diff --git a/images/fdinfo.proto b/images/fdinfo.proto index ac80f6260..56506690c 100644 --- a/images/fdinfo.proto +++ b/images/fdinfo.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + enum fd_types { UND = 0; REG = 1; diff --git a/images/fh.proto b/images/fh.proto index bda17c943..2da7e9deb 100644 --- a/images/fh.proto +++ b/images/fh.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; enum fh_entry_sizes { diff --git a/images/fifo.proto b/images/fifo.proto index c7938c093..9d5b9538b 100644 --- a/images/fifo.proto +++ b/images/fifo.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message fifo_entry { required uint32 id = 1; required uint32 pipe_id = 2; diff --git a/images/file-lock.proto b/images/file-lock.proto index e0aaaa4a6..5dd8847cc 100644 --- a/images/file-lock.proto +++ b/images/file-lock.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message file_lock_entry { required uint32 flag = 1; required uint32 type = 2; diff --git a/images/fown.proto b/images/fown.proto index f83779ec4..9956b9865 100644 --- a/images/fown.proto +++ b/images/fown.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message fown_entry { required uint32 uid = 1; required uint32 euid = 2; diff --git a/images/fs.proto b/images/fs.proto index d962a77fd..5b940a1c1 100644 --- a/images/fs.proto +++ b/images/fs.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message fs_entry { required uint32 cwd_id = 1; required uint32 root_id = 2; diff --git a/images/fsnotify.proto b/images/fsnotify.proto index fbe724cb3..1f73d9b01 100644 --- a/images/fsnotify.proto +++ b/images/fsnotify.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fh.proto"; import "fown.proto"; diff --git a/images/ghost-file.proto b/images/ghost-file.proto index db056dbcf..4b3415b68 100644 --- a/images/ghost-file.proto +++ b/images/ghost-file.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "time.proto"; diff --git a/images/inventory.proto b/images/inventory.proto index a107bb11f..f1b01f7e8 100644 --- a/images/inventory.proto +++ b/images/inventory.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "core.proto"; enum lsmtype { diff --git a/images/ipc-desc.proto b/images/ipc-desc.proto index 2a705ac31..b400bd7d2 100644 --- a/images/ipc-desc.proto +++ b/images/ipc-desc.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message ipc_desc_entry { required uint32 key = 1; required uint32 uid = 2; diff --git a/images/ipc-msg.proto b/images/ipc-msg.proto index 6e42f9bb1..5260ea862 100644 --- a/images/ipc-msg.proto +++ b/images/ipc-msg.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "ipc-desc.proto"; message ipc_msg { diff --git a/images/ipc-sem.proto b/images/ipc-sem.proto index 4ec65be4a..bffb581ae 100644 --- a/images/ipc-sem.proto +++ b/images/ipc-sem.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "ipc-desc.proto"; message ipc_sem_entry { diff --git a/images/ipc-shm.proto b/images/ipc-shm.proto index b402e8e03..4f331d2c2 100644 --- a/images/ipc-shm.proto +++ b/images/ipc-shm.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "ipc-desc.proto"; message ipc_shm_entry { diff --git a/images/ipc-var.proto b/images/ipc-var.proto index 4acda692a..b39cf7060 100644 --- a/images/ipc-var.proto +++ b/images/ipc-var.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message ipc_var_entry { repeated uint32 sem_ctls = 1; required uint32 msg_ctlmax = 2; diff --git a/images/mm.proto b/images/mm.proto index 7dc48427d..b372f45ff 100644 --- a/images/mm.proto +++ b/images/mm.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "vma.proto"; diff --git a/images/mnt.proto b/images/mnt.proto index 842973d5e..50cd8afbb 100644 --- a/images/mnt.proto +++ b/images/mnt.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; enum fstype { diff --git a/images/netdev.proto b/images/netdev.proto index 37cafb3b3..19b501c2f 100644 --- a/images/netdev.proto +++ b/images/netdev.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "tun.proto"; import "sysctl.proto"; diff --git a/images/ns.proto b/images/ns.proto index f053adce3..5ff000165 100644 --- a/images/ns.proto +++ b/images/ns.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message ns_file_entry { required uint32 id = 1; required uint32 ns_id = 2; diff --git a/images/opts.proto b/images/opts.proto index 18ea7b648..380d54ae0 100644 --- a/images/opts.proto +++ b/images/opts.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "google/protobuf/descriptor.proto"; message CRIU_Opts { diff --git a/images/packet-sock.proto b/images/packet-sock.proto index 745ecf8e2..f6198c1d4 100644 --- a/images/packet-sock.proto +++ b/images/packet-sock.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; import "sk-opts.proto"; diff --git a/images/pagemap.proto b/images/pagemap.proto index b492488c7..e45549cd6 100644 --- a/images/pagemap.proto +++ b/images/pagemap.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; message pagemap_head { diff --git a/images/pipe-data.proto b/images/pipe-data.proto index 555f0394d..78d53a890 100644 --- a/images/pipe-data.proto +++ b/images/pipe-data.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message pipe_data_entry { required uint32 pipe_id = 1; required uint32 bytes = 2; diff --git a/images/pipe.proto b/images/pipe.proto index d374430bf..a9a213b90 100644 --- a/images/pipe.proto +++ b/images/pipe.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; diff --git a/images/pstree.proto b/images/pstree.proto index 6cbcfd3e3..23e88aa74 100644 --- a/images/pstree.proto +++ b/images/pstree.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message pstree_entry { required uint32 pid = 1; required uint32 ppid = 2; diff --git a/images/regfile.proto b/images/regfile.proto index 25b1e4193..bc4c14d4d 100644 --- a/images/regfile.proto +++ b/images/regfile.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; diff --git a/images/remap-file-path.proto b/images/remap-file-path.proto index 68549746b..2221800c7 100644 --- a/images/remap-file-path.proto +++ b/images/remap-file-path.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + enum remap_type { LINKED = 0; GHOST = 1; diff --git a/images/rlimit.proto b/images/rlimit.proto index bcf1134b4..773a8df9c 100644 --- a/images/rlimit.proto +++ b/images/rlimit.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message rlimit_entry { required uint64 cur = 1; required uint64 max = 2; diff --git a/images/rpc.proto b/images/rpc.proto index 27583c14a..11d169bfc 100644 --- a/images/rpc.proto +++ b/images/rpc.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message criu_page_server_info { optional string address = 1; optional int32 port = 2; diff --git a/images/sa.proto b/images/sa.proto index e5099100b..d4c590a13 100644 --- a/images/sa.proto +++ b/images/sa.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; message sa_entry { diff --git a/images/seccomp.proto b/images/seccomp.proto index 03b248cc0..565a7cdd4 100644 --- a/images/seccomp.proto +++ b/images/seccomp.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message seccomp_filter { required bytes filter = 1; optional uint32 prev = 2; diff --git a/images/siginfo.proto b/images/siginfo.proto index c3630f9c0..e0d141e6c 100644 --- a/images/siginfo.proto +++ b/images/siginfo.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message siginfo_entry { required bytes siginfo = 1; } diff --git a/images/signalfd.proto b/images/signalfd.proto index 0af21598d..31d0d9f00 100644 --- a/images/signalfd.proto +++ b/images/signalfd.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; diff --git a/images/sk-inet.proto b/images/sk-inet.proto index a2770dfae..01dda875a 100644 --- a/images/sk-inet.proto +++ b/images/sk-inet.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; import "sk-opts.proto"; diff --git a/images/sk-netlink.proto b/images/sk-netlink.proto index bca533c30..ed24c5026 100644 --- a/images/sk-netlink.proto +++ b/images/sk-netlink.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; import "sk-opts.proto"; diff --git a/images/sk-opts.proto b/images/sk-opts.proto index 1d21651a1..b5374c976 100644 --- a/images/sk-opts.proto +++ b/images/sk-opts.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message sk_opts_entry { required uint32 so_sndbuf = 1; required uint32 so_rcvbuf = 2; diff --git a/images/sk-packet.proto b/images/sk-packet.proto index 10ef5c936..5f61c7376 100644 --- a/images/sk-packet.proto +++ b/images/sk-packet.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message sk_packet_entry { required uint32 id_for = 1; required uint32 length = 2; diff --git a/images/sk-unix.proto b/images/sk-unix.proto index aa2bcf7e1..9c90376ac 100644 --- a/images/sk-unix.proto +++ b/images/sk-unix.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; import "sk-opts.proto"; diff --git a/images/stats.proto b/images/stats.proto index 16acf3400..81887669b 100644 --- a/images/stats.proto +++ b/images/stats.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + // This one contains statistics about dump/restore process message dump_stats_entry { required uint32 freezing_time = 1; diff --git a/images/sysctl.proto b/images/sysctl.proto index 3b78c8f35..4ecdf2701 100644 --- a/images/sysctl.proto +++ b/images/sysctl.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + enum SysctlType { CTL_STR = 5; CTL_32 = 6; diff --git a/images/tcp-stream.proto b/images/tcp-stream.proto index 59c053e45..60ba123de 100644 --- a/images/tcp-stream.proto +++ b/images/tcp-stream.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; message tcp_stream_entry { diff --git a/images/time.proto b/images/time.proto index 09cdf42a6..4bb2b9459 100644 --- a/images/time.proto +++ b/images/time.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message timeval { required uint64 tv_sec = 1; required uint64 tv_usec = 2; diff --git a/images/timer.proto b/images/timer.proto index c584dec6d..a254a6f80 100644 --- a/images/timer.proto +++ b/images/timer.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message itimer_entry { required uint64 isec = 1; required uint64 iusec = 2; diff --git a/images/timerfd.proto b/images/timerfd.proto index 9e3ba6709..243281549 100644 --- a/images/timerfd.proto +++ b/images/timerfd.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; diff --git a/images/tty.proto b/images/tty.proto index f3d55f6f0..c921c7d4f 100644 --- a/images/tty.proto +++ b/images/tty.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; import "fown.proto"; diff --git a/images/tun.proto b/images/tun.proto index 4798166e5..796e1f5d9 100644 --- a/images/tun.proto +++ b/images/tun.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; message tunfile_entry { diff --git a/images/userns.proto b/images/userns.proto index 942854961..16be6b161 100644 --- a/images/userns.proto +++ b/images/userns.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message uid_gid_extent { required uint32 first = 1; required uint32 lower_first = 2; diff --git a/images/utsns.proto b/images/utsns.proto index cf0a752b7..a29aea1c2 100644 --- a/images/utsns.proto +++ b/images/utsns.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message utsns_entry { required string nodename = 1; required string domainname = 2; diff --git a/images/vma.proto b/images/vma.proto index e65070711..7085f4237 100644 --- a/images/vma.proto +++ b/images/vma.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + import "opts.proto"; message vma_entry { diff --git a/test/others/unix-callback/unix.proto b/test/others/unix-callback/unix.proto index fb06fc853..71127860f 100644 --- a/test/others/unix-callback/unix.proto +++ b/test/others/unix-callback/unix.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message unix_test { required uint32 val = 1; required bytes name = 2; diff --git a/test/zdtm/static/criu-rtc.proto b/test/zdtm/static/criu-rtc.proto index 5d5cee956..fcf8815b6 100644 --- a/test/zdtm/static/criu-rtc.proto +++ b/test/zdtm/static/criu-rtc.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + message criu_rtc { required uint64 IRQP = 1; }