[Xen-changelog] [xen stable-4.2] tools/console: Fix build after "xenconsole tolerate tty errors"

[patchbot@xxxxxxx]

commit 80a11b92a47cb8278c074f83f9ea29b7825eaa74
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Wed Oct 21 15:10:22 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Oct 21 15:11:52 2015 +0100

    tools/console: Fix build after "xenconsole tolerate tty errors"
    
    2ddcdd96 "tools/console: xenconsole tolerate tty errors" contains a
    compile error introduced during conflict resolution of the backport
    from 4.4 to 4.3:
    
     client/main.c: In function 'get_pty_fd':
     client/main.c:124:10: error: passing argument 1 of 'warn' makes pointer 
from integer without a cast [-Werror]
     In file included from client/main.c:35:0:
     /usr/include/err.h:35:13: note: expected 'const char *' but argument is of 
type 'int'
    
    Fix this.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    (cherry picked from commit 85ca813ec23c5a60680e4a13777dad530065902b)
---
 tools/console/client/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/console/client/main.c b/tools/console/client/main.c
index fcab3b9..8ef309f 100644
--- a/tools/console/client/main.c
+++ b/tools/console/client/main.c
@@ -120,7 +120,7 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int 
seconds)
                                        continue;
                                pty_fd = open(pty_path, O_RDWR | O_NOCTTY);
                                if (pty_fd == -1) 
-                                       warn(errno, "Could not open tty `%s'", 
+                                       warn("Could not open tty `%s'",
                                            pty_path);
                        }
                        free(pty_path);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog