protobuf: Prepare scaffolds for procfs NS entries

[ xemul: rename pb.cflag -> pb.ns_cflag ]
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-show.c

@@ -27,6 +27,7 @@
 #include "protobuf.h"
 #include "protobuf/fdinfo.pb-c.h"
 #include "protobuf/regfile.pb-c.h"
+#include "protobuf/ns.pb-c.h"
 #include "protobuf/ghost-file.pb-c.h"
 #include "protobuf/fifo.pb-c.h"
 #include "protobuf/remap-file-path.pb-c.h"
@@ -65,6 +66,11 @@ void show_fown_cont(void *p)
 	       fown->uid, fown->euid, fown->signum, fown->pid_type, fown->pid);
 }
 
+void show_ns_files(int fd)
+{
+	pb_show_plain(fd, PB_NS_FILES);
+}
+
 void show_reg_files(int fd_reg_files)
 {
 	pb_show_plain(fd_reg_files, PB_REG_FILES);

image.c

@@ -122,6 +122,7 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
 	FD_ENTRY(PAGEMAP,	"pagemap-%ld",	 show_pagemap),
 	FD_ENTRY(SHMEM_PAGEMAP,	"pagemap-shmem-%ld", show_pagemap),
 	FD_ENTRY(REG_FILES,	"reg-files",	 show_reg_files),
+	FD_ENTRY(NS_FILES,	"ns-files",	 show_ns_files),
 	FD_ENTRY(EVENTFD,	"eventfd",	 show_eventfds),
 	FD_ENTRY(EVENTPOLL,	"eventpoll",	 show_eventpoll),
 	FD_ENTRY(EVENTPOLL_TFD,	"eventpoll-tfd", show_eventpoll_tfd),

include/crtools.h

@@ -62,6 +62,7 @@ enum {
 	_CR_FD_GLOB_FROM,
 	CR_FD_SK_QUEUES,
 	CR_FD_REG_FILES,
+	CR_FD_NS_FILES,
 	CR_FD_INETSK,
 	CR_FD_UNIXSK,
 	CR_FD_PACKETSK,
@@ -161,6 +162,7 @@ struct cr_fd_desc_tmpl {
 void show_files(int fd);
 void show_pagemap(int fd);
 void show_reg_files(int fd);
+void show_ns_files(int fd);
 void show_core(int fd);
 void show_ids(int fd);
 void show_mm(int fd);

include/magic.h

@@ -68,6 +68,7 @@
 #define SIGNAL_MAGIC		0x59255647 /* Berezniki */
 #define PSIGNAL_MAGIC		SIGNAL_MAGIC
 #define NETLINKSK_MAGIC		0x58005614 /* Perm */
+#define NS_FILES_MAGIC		0x61394011 /* Nyandoma */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC

include/protobuf.h

@@ -29,6 +29,7 @@ enum {
 	PB_TCP_STREAM,
 	PB_SK_QUEUES,
 	PB_REG_FILES,
+	PB_NS_FILES,
 	PB_INETSK,
 	PB_UNIXSK,
 	PB_PACKETSK,

protobuf.c

@@ -20,6 +20,7 @@
 #include "protobuf/inventory.pb-c.h"
 #include "protobuf/stats.pb-c.h"
 #include "protobuf/regfile.pb-c.h"
+#include "protobuf/ns.pb-c.h"
 #include "protobuf/eventfd.pb-c.h"
 #include "protobuf/eventpoll.pb-c.h"
 #include "protobuf/signalfd.pb-c.h"
@@ -97,6 +98,7 @@ void cr_pb_init(void)
 	CR_PB_DESC(STATS,		Stats,		stats);
 	CR_PB_DESC(FDINFO,		Fdinfo,		fdinfo);
 	CR_PB_DESC(REG_FILES,		RegFile,	reg_file);
+	CR_PB_DESC(NS_FILES,		NsFile,		ns_file);
 	CR_PB_DESC(EVENTFD,		EventfdFile,	eventfd_file);
 	CR_PB_DESC(EVENTPOLL,		EventpollFile,	eventpoll_file);
 	CR_PB_DESC(EVENTPOLL_TFD,	EventpollTfd,	eventpoll_tfd);

protobuf/Makefile

@@ -16,6 +16,7 @@ proto-obj-y	+= core-arm.o
 proto-obj-y	+= inventory.o
 proto-obj-y	+= fdinfo.o
 proto-obj-y	+= fown.o
+proto-obj-y	+= ns.o
 proto-obj-y	+= regfile.o
 proto-obj-y	+= ghost-file.o
 proto-obj-y	+= fifo.o

protobuf/fdinfo.proto

@@ -13,6 +13,7 @@ enum fd_types {
 	TTY		= 11;
 	FANOTIFY	= 12;
 	NETLINKSK	= 13;
+	NS		= 14;
 }
 
 message fdinfo_entry {

protobuf/ns.proto

+message ns_file_entry {
+	required uint32		id		= 1;
+	required uint32		ns_id		= 2;
+	required uint32		ns_cflag	= 3;
+	required uint32		flags		= 4;
+}