tty: Brush up ctl tty preparation

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-restore.c

@@ -135,11 +135,9 @@ static int prepare_shared(void)
 		if (ret < 0)
 			break;
 
-		if (pi->ctl_tty_id) {
-			ret = prepare_ctl_tty(pi->pid.virt, pi->rst, pi->ctl_tty_id);
-			if (ret < 0)
-				break;
-		}
+		ret = prepare_ctl_tty(pi->pid.virt, pi->rst, pi->ctl_tty_id);
+		if (ret < 0)
+			break;
 	}
 
 	mark_pipe_master();

files.c

@@ -198,9 +198,17 @@ static int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info)
 
 int prepare_ctl_tty(int pid, struct rst_info *rst_info, u32 ctl_tty_id)
 {
-	FdinfoEntry *e = xmalloc(sizeof(*e));
+	FdinfoEntry *e;
+
+	if (!ctl_tty_id)
+		return 0;
+
+	pr_info("Requesting for ctl tty %#x into service fd\n", ctl_tty_id);
+
+	e = xmalloc(sizeof(*e));
 	if (!e)
 		return -1;
+
 	fdinfo_entry__init(e);
 
 	e->id		= ctl_tty_id;