Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

x86: cpu -- Don't fail if member is not present in image

Browse source 
When migrating from old images the particular xsave member
might not be present in core-* image, which is fine we
simply left data as initial zero state.

https://jira.sw.ru/browse/PSBM-89215

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2018-10-03 14:54:11 +03:00 • committed by Andrei Vagin
parent deef94ce7c
commit 740ae4a360
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
criu/arch/x86/crtools.c
View file

@ -438,9 +438,14 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
size_t size = pb_repeated_size(xsave, member); \
size_t xsize = (size_t)compel_fpu_feature_size(feature); \
if (xsize != size) { \
pr_err("%s reported %zu bytes (expecting %zu)\n", \
# feature, xsize, size); \
return -1; \
if (size) { \
pr_err("%s reported %zu bytes (expecting %zu)\n",\
# feature, xsize, size); \
return -1; \
} else { \
pr_debug("%s is not present in image, ignore\n",\
# feature); \
} \
} \
xstate_bv |= (1UL << feature); \
xstate_size += xsize; \