[CRIU] [PATCH 2/4] p.haul: remove redundant __apply_cg_config function

Nikita Spiridonov nspiridonov at odin.com
Wed Nov 18 04:14:40 PST 2015


Remove redundant __apply_cg_config internal funciton of Virtuozzo
module.

Signed-off-by: Nikita Spiridonov <nspiridonov at odin.com>
---
 phaul/p_haul_vz.py |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/phaul/p_haul_vz.py b/phaul/p_haul_vz.py
index 5db6be3..f2ec9a4 100644
--- a/phaul/p_haul_vz.py
+++ b/phaul/p_haul_vz.py
@@ -80,11 +80,6 @@ class p_haul_type:
 	def __ct_config_path(self, conf_dir):
 		return os.path.join(conf_dir, "{0}.conf".format(self._ctid))
 
-	def __apply_cg_config(self):
-		logging.info("Applying CT configs")
-		# FIXME -- implement
-		pass
-
 	def __cg_set_veid(self):
 		"""Initialize veid in ve.veid for ve cgroup"""
 
@@ -169,12 +164,7 @@ class p_haul_type:
 			self.__remove_restore_extra_args(args_path)
 
 	def prepare_ct(self, pid):
-		"""Create cgroup hierarchy and put root task into it.
-
-		Hierarchy is unlimited, we will apply config limitations in
-		__apply_cg_config later.
-		"""
-
+		"""Create cgroup hierarchy and put root task into it."""
 		self.__cg_set_veid()
 
 	def mount(self):
@@ -229,7 +219,7 @@ class p_haul_type:
 		return fs_haul_ploop.p_haul_fs_receiver(fname_path, fs_sk)
 
 	def restored(self, pid):
-		self.__apply_cg_config()
+		pass
 
 	def net_lock(self):
 		for veth in self._veths:
-- 
1.7.1



More information about the CRIU mailing list