protobuf: Convert IPC entries to PB format v2

v2 (from skinsbursky@)
 - drop redundant header inclusion
 - drop redundant "goto out"
 - drop redundant NULL assignment
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

include/image.h

@@ -66,56 +66,6 @@ struct vma_entry {
 	s64	fd;
 } __packed;
 
-struct ipc_var_entry {
-	u32	sem_ctls[4];
-	u32	msg_ctlmax;
-	u32	msg_ctlmnb;
-	u32	msg_ctlmni;
-	u32	auto_msgmni;
-	u64	shm_ctlmax;
-	u64	shm_ctlall;
-	u32	shm_ctlmni;
-	u32	shm_rmid_forced;
-	u32	mq_queues_max;
-	u32	mq_msg_max;
-	u32	mq_msgsize_max;
-} __packed;
-
-struct ipc_desc_entry {
-	u32	key;
-	u32	uid;
-	u32	gid;
-	u32	cuid;
-	u32	cgid;
-	u32	mode;
-	u32	id;
-	u8	pad[4];
-} __packed;
-
-struct ipc_shm_entry {
-	struct ipc_desc_entry desc;
-	u64	size;
-} __packed;
-
-struct ipc_msg {
-	u64	mtype;
-	u32	msize;
-	u8	pad[4];
-} __packed;
-
-struct ipc_msg_entry {
-	struct ipc_desc_entry desc;
-	u16	qbytes;
-	u16	qnum;
-	u8	pad[4];
-} __packed;
-
-struct ipc_sem_entry {
-	struct ipc_desc_entry desc;
-	u16	nsems;
-	u8	pad[6];
-} __packed;
-
 #define VMA_AREA_NONE		(0 <<  0)
 #define VMA_AREA_REGULAR	(1 <<  0)	/* Dumpable area */
 #define VMA_AREA_STACK		(1 <<  1)

protobuf/Makefile

@@ -42,6 +42,11 @@ PROTO_FILES	+= mm.proto
 PROTO_FILES	+= sk-opts.proto
 PROTO_FILES	+= sk-unix.proto
 PROTO_FILES	+= sk-inet.proto
+PROTO_FILES	+= ipc-var.proto
+PROTO_FILES	+= ipc-desc.proto
+PROTO_FILES	+= ipc-shm.proto
+PROTO_FILES	+= ipc-msg.proto
+PROTO_FILES	+= ipc-sem.proto
 
 HDRS	:= $(patsubst %.proto,%.pb-c.h,$(PROTO_FILES))
 SRCS	:= $(patsubst %.proto,%.pb-c.c,$(PROTO_FILES))

protobuf/ipc-desc.proto

+message ipc_desc_entry {
+	required uint32		key	= 1;
+	required uint32		uid	= 2;
+	required uint32		gid	= 3;
+	required uint32		cuid	= 4;
+	required uint32		cgid	= 5;
+	required uint32		mode	= 6;
+	required uint32		id	= 7;
+}

protobuf/ipc-msg.proto

+import "ipc-desc.proto";
+
+message ipc_msg {
+	required uint64		mtype	= 1;
+	required uint32		msize	= 2;
+}
+
+message ipc_msg_entry {
+	required ipc_desc_entry	desc	= 1;
+	required uint32		qbytes	= 2;
+	required uint32		qnum	= 3;
+}

protobuf/ipc-sem.proto

+import "ipc-desc.proto";
+
+message ipc_sem_entry {
+	required ipc_desc_entry	desc	= 1;
+	required uint32		nsems	= 2;
+}

protobuf/ipc-shm.proto

+import "ipc-desc.proto";
+
+message ipc_shm_entry {
+	required ipc_desc_entry		desc	= 1;
+	required uint64			size	= 2;
+}

protobuf/ipc-var.proto

+message ipc_var_entry {
+	repeated uint32			sem_ctls		=  1;
+	required uint32			msg_ctlmax		=  2;
+	required uint32			msg_ctlmnb		=  3;
+	required uint32			msg_ctlmni		=  4;
+	required uint32			auto_msgmni		=  5;
+	required uint64			shm_ctlmax		=  6;
+	required uint64			shm_ctlall		=  7;
+	required uint32			shm_ctlmni		=  8;
+	required uint32			shm_rmid_forced		=  9;
+	required uint32			mq_queues_max		= 10;
+	required uint32			mq_msg_max		= 11;
+	required uint32			mq_msgsize_max		= 12;
+}