From 5c93ba3b7b367834f53d3eea307062fdb1dfb5be Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Mon, 30 Jun 2014 21:58:04 +0400
Subject: [PATCH] timerfd: Add protobuf entries into the image

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 cr-show.c               | 1 +
 image-desc.c            | 1 +
 include/image-desc.h    | 1 +
 include/magic.h         | 1 +
 include/protobuf-desc.h | 5 +++--
 protobuf-desc.c         | 1 +
 protobuf/fdinfo.proto   | 1 +
 7 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cr-show.c b/cr-show.c
index 1d762c409..5549c8d11 100644
--- a/cr-show.c
+++ b/cr-show.c
@@ -304,6 +304,7 @@ static struct show_image_info show_infos[] = {
 	SHOW_PLAIN(EVENTPOLL_FILE),
 	SHOW_PLAIN(EVENTPOLL_TFD),
 	SHOW_PLAIN(SIGNALFD),
+	SHOW_PLAIN(TIMERFD),
 	SHOW_PLAIN(INOTIFY_FILE),
 	SHOW_PLAIN(INOTIFY_WD),
 	SHOW_PLAIN(FANOTIFY_FILE),
diff --git a/image-desc.c b/image-desc.c
index 64c6964b3..1e0e3f0bd 100644
--- a/image-desc.c
+++ b/image-desc.c
@@ -78,6 +78,7 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
 	FD_ENTRY(PSIGNAL,	"signal-p-%d"),
 	FD_ENTRY(TUNFILE,	"tunfile"),
 	FD_ENTRY(CGROUP,	"cgroup"),
+	FD_ENTRY(TIMERFD,	"timerfd"),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/include/image-desc.h b/include/image-desc.h
index aa2fb374c..eb42990c6 100644
--- a/include/image-desc.h
+++ b/include/image-desc.h
@@ -75,6 +75,7 @@ enum {
 	CR_FD_FANOTIFY_MARK,
 	CR_FD_TUNFILE,
 	CR_FD_CGROUP,
+	CR_FD_TIMERFD,
 	_CR_FD_GLOB_TO,
 
 	CR_FD_TMPFS_IMG,
diff --git a/include/magic.h b/include/magic.h
index 2e1243da5..5192a60a9 100644
--- a/include/magic.h
+++ b/include/magic.h
@@ -73,6 +73,7 @@
 #define NS_FILES_MAGIC		0x61394011 /* Nyandoma */
 #define TUNFILE_MAGIC		0x57143751 /* Kalyazin */
 #define CGROUP_MAGIC		0x59383330 /* Tikhvin */
+#define TIMERFD_MAGIC		0x50493712 /* Korocha */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/include/protobuf-desc.h b/include/protobuf-desc.h
index 42f837df8..01c9f4c15 100644
--- a/include/protobuf-desc.h
+++ b/include/protobuf-desc.h
@@ -51,6 +51,7 @@ enum {
 	PB_TUNFILE,
 	PB_IRMAP_CACHE,
 	PB_CGROUP,
+	PB_TIMERFD,
 
 	/* PB_AUTOGEN_STOP */
 
@@ -58,9 +59,9 @@ enum {
 	PB_IDS,
 	PB_SIGACT,
 	PB_NETDEV,
-	PB_REMAP_FPATH,
+	PB_REMAP_FPATH,		/* 50 */
 	PB_SK_QUEUES,
-	PB_IPCNS_MSG,		/* 50 */
+	PB_IPCNS_MSG,
 	PB_IPCNS_MSG_ENT,
 
 	PB_MAX,
diff --git a/protobuf-desc.c b/protobuf-desc.c
index 86c3acbe8..b97418bb2 100644
--- a/protobuf-desc.c
+++ b/protobuf-desc.c
@@ -58,6 +58,7 @@
 #include "protobuf/vma.pb-c.h"
 #include "protobuf/tun.pb-c.h"
 #include "protobuf/cgroup.pb-c.h"
+#include "protobuf/timerfd.pb-c.h"
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];
 
diff --git a/protobuf/fdinfo.proto b/protobuf/fdinfo.proto
index 844965ab5..049c01826 100644
--- a/protobuf/fdinfo.proto
+++ b/protobuf/fdinfo.proto
@@ -16,6 +16,7 @@ enum fd_types {
 	NS		= 14;
 	TUN		= 15;
 	EXT		= 16;
+	TIMERFD		= 17;
 }
 
 message fdinfo_entry {