Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

image: Rename binfmt_misc image format as "old"

Browse source 
Also add new format without suffix in file name

v6: New
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2016-08-23 19:16:23 +03:00 • committed by Pavel Emelyanov
parent 3acefff9cc
commit 6eaedfaa76
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
criu/image-desc.c
View file

@ -79,7 +79,8 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
FD_ENTRY_F(TMPFS_IMG, "tmpfs-%d.tar.gz", O_NOBUF),
FD_ENTRY_F(TMPFS_DEV, "tmpfs-dev-%d.tar.gz", O_NOBUF),
FD_ENTRY_F(AUTOFS, "autofs-%d", O_NOBUF),
FD_ENTRY(BINFMT_MISC, "binfmt-misc-%d"),
FD_ENTRY(BINFMT_MISC_OLD, "binfmt-misc-%d"),
FD_ENTRY(BINFMT_MISC, "binfmt-misc"),
FD_ENTRY(TTY_FILES, "tty"),
FD_ENTRY(TTY_INFO, "tty-info"),
FD_ENTRY_F(TTY_DATA, "tty-data", O_NOBUF),

1
criu/include/image-desc.h
View file

@ -86,6 +86,7 @@ enum {
CR_FD_TMPFS_IMG,
CR_FD_TMPFS_DEV,
CR_FD_BINFMT_MISC,
CR_FD_BINFMT_MISC_OLD,
CR_FD_PAGES,
CR_FD_VMAS,

1
criu/include/magic.h
View file

@ -107,6 +107,7 @@
#define PAGES_OLD_MAGIC PAGEMAP_MAGIC
#define SHM_PAGES_OLD_MAGIC PAGEMAP_MAGIC
#define BINFMT_MISC_OLD_MAGIC BINFMT_MISC_MAGIC
/*
* These are special files, not exactly images

4
criu/mount.c
View file

@ -1383,7 +1383,7 @@ static int binfmt_misc_dump(struct mount_info *pm)
}
ret = -1;
img = open_image(CR_FD_BINFMT_MISC, O_DUMP, pm->s_dev);
img = open_image(CR_FD_BINFMT_MISC_OLD, O_DUMP, pm->s_dev);
if (!img)
goto out;
@ -1497,7 +1497,7 @@ static int binfmt_misc_restore(struct mount_info *mi)
if (!buf)
return -1;
img = open_image(CR_FD_BINFMT_MISC, O_RSTR, mi->s_dev);
img = open_image(CR_FD_BINFMT_MISC_OLD, O_RSTR, mi->s_dev);
if (!img) {
goto free_buf;
}