[CRIU] [PATCH 4/7] module: Rename final_restore into criu_restore

Tycho Andersen tycho.andersen at canonical.com
Thu Oct 22 10:04:16 PDT 2015


On Thu, Oct 22, 2015 at 03:45:56PM +0300, Pavel Emelyanov wrote:
> Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
> ---
>  phaul/p_haul_lxc.py    | 2 +-
>  phaul/p_haul_module.py | 2 +-
>  phaul/p_haul_pid.py    | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/phaul/p_haul_lxc.py b/phaul/p_haul_lxc.py
> index f5770e8..702ade2 100644
> --- a/phaul/p_haul_lxc.py
> +++ b/phaul/p_haul_lxc.py
> @@ -115,7 +115,7 @@ class p_haul_type:
>  		shutil.copy(os.path.join(dir, "config"), self.__ct_config())
>  
>  	def final_restore(self, img, connection):
> -		p_haul_module.final_restore(self, img, connection)
> +		p_haul_module.criu_restore(self, img, connection)
>  
>  	def prepare_ct(self, pid):
>  		pass
> diff --git a/phaul/p_haul_module.py b/phaul/p_haul_module.py
> index 8fe4e8c..fdd4ca6 100644
> --- a/phaul/p_haul_module.py
> +++ b/phaul/p_haul_module.py
> @@ -6,7 +6,7 @@ import logging
>  import pycriu.rpc
>  import criu_req
>  
> -def final_restore(htype, img, connection):
> +def criu_restore(htype, img, connection):

Do we need criu_ here, or can we just do restore() (and dump())?

>  	"""Perform final restore"""
>  
>  	nroot = htype.mount()
> diff --git a/phaul/p_haul_pid.py b/phaul/p_haul_pid.py
> index e0f9d2f..7b381a9 100644
> --- a/phaul/p_haul_pid.py
> +++ b/phaul/p_haul_pid.py
> @@ -63,7 +63,7 @@ class p_haul_type:
>  		pass
>  
>  	def final_restore(self, img, connection):
> -		p_haul_module.final_restore(self, img, connection)
> +		p_haul_module.criu_restore(self, img, connection)
>  
>  	# Things are started to get restored, only the
>  	# first task (with pid @pid) is created.
> -- 
> 1.9.3
> 
> 


More information about the CRIU mailing list