[CRIU] [PATCH 7/7] criu_req: Remove htype from make_predump_req

Pavel Emelyanov xemul at parallels.com
Thu Oct 22 05:46:28 PDT 2015


Pre-dumps are also htype-agnostic as they do generic memory
tracking, irmap and alike.

Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 phaul/criu_req.py     | 4 ++--
 phaul/p_haul_iters.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phaul/criu_req.py b/phaul/criu_req.py
index 2bf53cd..ab55f1f 100644
--- a/phaul/criu_req.py
+++ b/phaul/criu_req.py
@@ -59,10 +59,10 @@ def _make_common_dump_req(typ, pid, htype, img, connection, fs):
 
 	return req
 
-def make_predump_req(pid, htype, img, connection, fs):
+def make_predump_req(pid, img, connection, fs):
 	"""Prepare pre-dump criu request (source side)"""
 	return _make_common_dump_req(
-		pycriu.rpc.PRE_DUMP, pid, htype, img, connection, fs)
+		pycriu.rpc.PRE_DUMP, pid, None, img, connection, fs)
 
 def make_dump_req(pid, htype, img, connection, fs):
 	"""Prepare dump criu request (source side)"""
diff --git a/phaul/p_haul_iters.py b/phaul/p_haul_iters.py
index 6ad0a91..7f1351b 100644
--- a/phaul/p_haul_iters.py
+++ b/phaul/p_haul_iters.py
@@ -138,7 +138,7 @@ class phaul_iter_worker:
 			logging.info("\tIssuing pre-dump command to service")
 
 			req = criu_req.make_predump_req(
-				self.pid, self.htype, self.img, self.criu_connection, self.fs)
+				self.pid, self.img, self.criu_connection, self.fs)
 			resp = self.criu_connection.send_req(req)
 			if not resp.success:
 				raise Exception("Pre-dump failed")
-- 
1.9.3




More information about the CRIU mailing list