[CRIU] [PATCH] criu: mem: initialize parasite_ctl->mem_pp

Mike Rapoport mike.rapoport at gmail.com
Wed Jul 6 19:25:42 PDT 2016


On Wed, Jul 06, 2016 at 03:50:12PM -0700, Andrew Vagin wrote:
> On Wed, Jul 06, 2016 at 09:59:27AM +0300, Pavel Emelyanov wrote:
> > OK, this happened to be simpler than I thought yesterday.
> > This one applied ... meanwhile %)
> > 
> 
> ========================== Run zdtm/static/env00 in h ==========================
> Start test
> ./env00 --pidfile=env00.pid --outfile=env00.out --envname=ENV_00_TEST
> Run criu pre-dump
> ################# Test zdtm/static/env00 FAIL at CRIU pre-dump #################
> Wait for zdtm/static/env00 to die for 0.100000
> ##################################### FAIL #####################################

The patch below seems to fix it:

>From 8d68544ea3ec53f170cba0b393f3b8f4e65d2d07 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt at linux.vnet.ibm.com>
Date: Thu, 7 Jul 2016 11:21:53 +0900
Subject: [PATCH] criu: mem: initialize parasite_ctl->mem_pp

apparently got lost in rebase :)

Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
---
 criu/mem.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/criu/mem.c b/criu/mem.c
index 6d7f235..50a00c5 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -292,8 +292,9 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
 		return -1;
 
 	ret = -1;
-	pp = create_page_pipe(vma_area_list->priv_size, pargs_iovs(args),
-				!delayed_dump, !seized_native(ctl));
+	ctl->mem_pp = pp = create_page_pipe(vma_area_list->priv_size,
+					    pargs_iovs(args),
+					    !delayed_dump, !seized_native(ctl));
 	if (!pp)
 		goto out;
 
-- 
1.9.1



More information about the CRIU mailing list