mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 22:05:36 +00:00
Code Issues Releases Wiki Activity

tty: Get driver for info once

Browse Source 
Since we need tty driver for info, we may lookup the guy
when collecting info, not when attaching it to a file.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov
2017-07-19 14:20:03 +03:00
parent 081a312604
commit c93edee2cb
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
criu/tty.c
View File

@@ -1504,6 +1504,7 @@ static int collect_one_tty_info_entry(void *obj, ProtobufCMessage *msg, struct c
{ {
struct tty_info *info, *n; struct tty_info *info, *n;
TtyInfoEntry *tie; TtyInfoEntry *tie;
struct tty_driver *driver;
tie = pb_msg(msg, TtyInfoEntry); tie = pb_msg(msg, TtyInfoEntry);
@@ -1529,11 +1530,19 @@ static int collect_one_tty_info_entry(void *obj, ProtobufCMessage *msg, struct c
return -1; return -1;
} }
driver = get_tty_driver(tie->rdev, tie->dev);
if (driver == NULL) {
pr_err("Unable to find a tty driver (rdev %#x dev %#x)\n",
tie->rdev, tie->dev);
return -1;
}
list_for_each_entry_safe(info, n, &collected_ttys, list) { list_for_each_entry_safe(info, n, &collected_ttys, list) {
if (info->tfe->tty_info_id != tie->id) if (info->tfe->tty_info_id != tie->id)
continue; continue;
info->tie = tie; info->tie = tie;
info->driver = driver;
list_move_tail(&info->list, &all_ttys); list_move_tail(&info->list, &all_ttys);
if (tty_info_setup(info)) if (tty_info_setup(info))
@@ -1578,12 +1587,6 @@ static int collect_one_tty(void *obj, ProtobufCMessage *msg, struct cr_img *i)
static int tty_info_setup(struct tty_info *info) static int tty_info_setup(struct tty_info *info)
{ {
INIT_LIST_HEAD(&info->sibling); INIT_LIST_HEAD(&info->sibling);
info->driver = get_tty_driver(info->tie->rdev, info->tie->dev);
if (info->driver == NULL) {
pr_err("Unable to find a tty driver (rdev %#x dev %#x)\n",
info->tie->rdev, info->tie->dev);
return -1;
}
info->create = tty_is_master(info); info->create = tty_is_master(info);
info->inherit = false; info->inherit = false;
info->ctl_tty = NULL; info->ctl_tty = NULL;