Commit 7b5de25f authored by Pavel Emelyanov's avatar Pavel Emelyanov

Deprecate separate images for rlimits, itimers and posix-timers

Out-of-core rlims and timers existed before 1.3, so people trying
to restore from images generated of this old CRIU would have to
upgrade.
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 8c063fd2
...@@ -2054,6 +2054,9 @@ static int prepare_itimers_from_fd(int pid, struct task_restore_args *args) ...@@ -2054,6 +2054,9 @@ static int prepare_itimers_from_fd(int pid, struct task_restore_args *args)
struct cr_img *img; struct cr_img *img;
ItimerEntry *ie; ItimerEntry *ie;
if (!deprecated_ok("Itimers"))
return -1;
img = open_image(CR_FD_ITIMERS, O_RSTR, pid); img = open_image(CR_FD_ITIMERS, O_RSTR, pid);
if (!img) if (!img)
return -1; return -1;
...@@ -2176,6 +2179,9 @@ static int prepare_posix_timers_from_fd(int pid, struct task_restore_args *ta) ...@@ -2176,6 +2179,9 @@ static int prepare_posix_timers_from_fd(int pid, struct task_restore_args *ta)
int ret = -1; int ret = -1;
struct restore_posix_timer *t; struct restore_posix_timer *t;
if (!deprecated_ok("Posix timers"))
return -1;
img = open_image(CR_FD_POSIX_TIMERS, O_RSTR, pid); img = open_image(CR_FD_POSIX_TIMERS, O_RSTR, pid);
if (!img) if (!img)
return -1; return -1;
...@@ -2362,6 +2368,9 @@ static int prepare_rlimits_from_fd(int pid, struct task_restore_args *ta) ...@@ -2362,6 +2368,9 @@ static int prepare_rlimits_from_fd(int pid, struct task_restore_args *ta)
int ret; int ret;
struct cr_img *img; struct cr_img *img;
if (!deprecated_ok("Rlimits"))
return -1;
/* /*
* Old image -- read from the file. * Old image -- read from the file.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment