From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 16 May 2017 13:57:27 +0000 (+0100)
Subject: tools/xenconsoled: Preserve errno while rotating logfile handles
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2147
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7d4a5904b62731551e366ff62d84759c8ee68e2;p=xen.git

tools/xenconsoled: Preserve errno while rotating logfile handles

The logic to optionally exit after a poll() error relies on errno, but
handle_log_reload() does not preserve it.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Julien Grall <julien.grall@arm.com>
---

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 7e6a886d92..7e474bb038 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -1117,8 +1117,12 @@ void handle_io(void)
 		ret = poll(fds, nr_fds, next_timeout ? poll_timeout : -1);
 
 		if (log_reload) {
+			int saved_errno = errno;
+
 			handle_log_reload();
 			log_reload = 0;
+
+			errno = saved_errno;
 		}
 
 		/* Abort if poll failed, except for EINTR cases