tools/console: xenconsole tolerate tty errors

Since 28d386fc4341 (XSA-57), libxl writes an empty value for the
console tty node, with read-only permission for the guest, when
setting up pv console "frontends".  (The actual tty value is later set
by xenconsoled.)   Writing an empty node is not strictly necessary to
stop the frontend from writing dangerous values here, but it is a good
belt-and-braces approach.

Unfortunately this confuses xenconsole.  It reads the empty value, and
tries to open it as the tty.  xenconsole then exits.

Fix this by having xenconsole treat an empty value the same way as no
value at all.

Also, make the error opening the tty be nonfatal: we just print a
warning, but do not exit.  I think this is helpful in theoretical
situations where xenconsole is racing with libxl and/or xenconsoled.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
CC: George Dunlap <george.dunlap@eu.citrix.com>
---
v2: Combine two conditions and move the free
(cherry picked from commit 39ba2989b10b6a1852e253b204eb010f8e7026f1)
(cherry picked from commit 7b161be2e51c519754ac4435d63c8fc03db606ec)

Conflicts:
	tools/console/client/main.c
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/console/client/main.c b/tools/console/client/main.c
index 38c856a11261519022ec5cc1017bd6700c7cff1a..fcab3b975301abc3cce888ea3024035d762e1b80 100644 (file)
--- a/tools/console/client/main.c
+++ b/tools/console/client/main.c
@@ -115,15 +115,15 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int seconds)
                        /* We only watch for one thing, so no need to 
                         * disambiguate: just read the pty path */
                        pty_path = xs_read(xs, XBT_NULL, path, &len);
-                       if (pty_path != NULL) {
+                       if (pty_path != NULL && pty_path[0] != '\0') {
                                if (access(pty_path, R_OK|W_OK) != 0)
                                        continue;
                                pty_fd = open(pty_path, O_RDWR | O_NOCTTY);
                                if (pty_fd == -1) 
-                                       err(errno, "Could not open tty `%s'", 
+                                       warn(errno, "Could not open tty `%s'", 
                                            pty_path);
-                               free(pty_path);
                        }
+                       free(pty_path);
                }
        } while (pty_fd == -1 && (now = time(NULL)) < start + seconds);