[CRIU] [PATCH 6/6] protobuf: add criu.hex = true options to int64 fields

Ruslan Kuprieiev kupruser at gmail.com
Fri Jan 16 12:55:57 PST 2015


Signed-off-by: Ruslan Kuprieiev <kupruser at gmail.com>
---
 protobuf/core-x86.proto | 64 +++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/protobuf/core-x86.proto b/protobuf/core-x86.proto
index b6eb0b3..0b1066b 100644
--- a/protobuf/core-x86.proto
+++ b/protobuf/core-x86.proto
@@ -1,35 +1,37 @@
+import "opts.proto";
+
 message user_x86_regs_entry {
-	required uint64			r15		=  1;
-	required uint64			r14		=  2;
-	required uint64			r13		=  3;
-	required uint64			r12		=  4;
-	required uint64			bp		=  5;
-	required uint64			bx		=  6;
-	required uint64			r11		=  7;
-	required uint64			r10		=  8;
-	required uint64			r9		=  9;
-	required uint64			r8		= 10;
-	required uint64			ax		= 11;
-	required uint64			cx		= 12;
-	required uint64			dx		= 13;
-	required uint64			si		= 14;
-	required uint64			di		= 15;
-	required uint64			orig_ax		= 16;
-	required uint64			ip		= 17;
-	required uint64			cs		= 18;
-	required uint64			flags		= 19;
-	required uint64			sp		= 20;
-	required uint64			ss		= 21;
-	required uint64			fs_base		= 22;
-	required uint64			gs_base		= 23;
-	required uint64			ds		= 24;
-	required uint64			es		= 25;
-	required uint64			fs		= 26;
-	required uint64			gs		= 27;
+	required uint64			r15		=  1[(criu).hex = true];
+	required uint64			r14		=  2[(criu).hex = true];
+	required uint64			r13		=  3[(criu).hex = true];
+	required uint64			r12		=  4[(criu).hex = true];
+	required uint64			bp		=  5[(criu).hex = true];
+	required uint64			bx		=  6[(criu).hex = true];
+	required uint64			r11		=  7[(criu).hex = true];
+	required uint64			r10		=  8[(criu).hex = true];
+	required uint64			r9		=  9[(criu).hex = true];
+	required uint64			r8		= 10[(criu).hex = true];
+	required uint64			ax		= 11[(criu).hex = true];
+	required uint64			cx		= 12[(criu).hex = true];
+	required uint64			dx		= 13[(criu).hex = true];
+	required uint64			si		= 14[(criu).hex = true];
+	required uint64			di		= 15[(criu).hex = true];
+	required uint64			orig_ax		= 16[(criu).hex = true];
+	required uint64			ip		= 17[(criu).hex = true];
+	required uint64			cs		= 18[(criu).hex = true];
+	required uint64			flags		= 19[(criu).hex = true];
+	required uint64			sp		= 20[(criu).hex = true];
+	required uint64			ss		= 21[(criu).hex = true];
+	required uint64			fs_base		= 22[(criu).hex = true];
+	required uint64			gs_base		= 23[(criu).hex = true];
+	required uint64			ds		= 24[(criu).hex = true];
+	required uint64			es		= 25[(criu).hex = true];
+	required uint64			fs		= 26[(criu).hex = true];
+	required uint64			gs		= 27[(criu).hex = true];
 }
 
 message user_x86_xsave_entry {
-	required uint64			xstate_bv	=  1;
+	required uint64			xstate_bv	=  1[(criu).hex = true];
 	repeated uint32			ymmh_space	=  2;
 }
 
@@ -40,8 +42,8 @@ message user_x86_fpregs_entry {
 	required uint32			swd		=  2;
 	required uint32			twd		=  3;
 	required uint32			fop		=  4;
-	required uint64			rip		=  5;
-	required uint64			rdp		=  6;
+	required uint64			rip		=  5[(criu).hex = true];
+	required uint64			rdp		=  6[(criu).hex = true];
 	required uint32			mxcsr		=  7;
 	required uint32			mxcsr_mask	=  8;
 	repeated uint32			st_space	=  9;
@@ -55,7 +57,7 @@ message user_x86_fpregs_entry {
 }
 
 message thread_info_x86 {
-	required uint64			clear_tid_addr	= 1;
+	required uint64			clear_tid_addr	= 1[(criu).hex = true];
 	required user_x86_regs_entry	gpregs		= 2;
 	required user_x86_fpregs_entry	fpregs		= 3;
 }
-- 
2.1.0



More information about the CRIU mailing list